Update.

	* elf/dl-error.c: Likewise.
	* elf/dl-fini.c: Likewise.
	* elf/dl-runtime.c: Likewise.
	* elf/do-lookup.h: Likewise.

6 files changed, 44 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index aef459d570..1f465874e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,10 @@
 	* elf/dl-load.c: Likewise.
 	* elf/dl-dst.h: Likewise.
 	* elf/dl-init.c: Likewise.
+	* elf/dl-error.c: Likewise.
+	* elf/dl-fini.c: Likewise.
+	* elf/dl-runtime.c: Likewise.
+	* elf/do-lookup.h: Likewise.
 
 	* stdio-common/_itoa.h: Undefine SPECIAL to avoid duplicate
 	definition.
diff --git a/elf/dl-error.c b/elf/dl-error.c
index a297189d77..71088fbe4c 100644
--- a/elf/dl-error.c
+++ b/elf/dl-error.c
@@ -126,7 +126,7 @@ _dl_signal_cerror (int errcode, const char *objname, const char *occation,
       (*receiver) (errcode, objname, errstring);
     }
   else
-    INT(_dl_signal_error) (errcode, objname, occation, errstring);
+    INTUSE(_dl_signal_error) (errcode, objname, occation, errstring);
 }
 
 
diff --git a/elf/dl-fini.c b/elf/dl-fini.c
index ab6bf9c496..902ce086d9 100644
--- a/elf/dl-fini.c
+++ b/elf/dl-fini.c
@@ -147,8 +147,8 @@ _dl_fini (void)
 
 	  /* When debugging print a message first.  */
 	  if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_IMPCALLS, 0))
-	    INT(_dl_debug_printf) ("\ncalling fini: %s\n\n",
-				   l->l_name[0] ? l->l_name : _dl_argv[0]);
+	    INTUSE(_dl_debug_printf) ("\ncalling fini: %s\n\n",
+				      l->l_name[0] ? l->l_name : _dl_argv[0]);
 
 	  /* First see whether an array is given.  */
 	  if (l->l_info[DT_FINI_ARRAY] != NULL)
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 49ee42ad3c..8de301eaa8 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -168,11 +168,11 @@ add_dependency (struct link_map *undef_map, struct link_map *map)
 
       /* Display information if we are debugging.  */
       if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_FILES, 0))
-	INT(_dl_debug_printf) ("\
+	INTUSE(_dl_debug_printf) ("\
 \nfile=%s;  needed by %s (relocation dependency)\n\n",
-			       map->l_name[0] ? map->l_name : _dl_argv[0],
-			       undef_map->l_name[0]
-			       ? undef_map->l_name : _dl_argv[0]);
+				  map->l_name[0] ? map->l_name : _dl_argv[0],
+				  undef_map->l_name[0]
+				  ? undef_map->l_name : _dl_argv[0]);
     }
   else
     /* Whoa, that was bad luck.  We have to search again.  */
@@ -240,8 +240,8 @@ _dl_lookup_symbol (const char *undef_name, struct link_map *undef_map,
 	    && add_dependency (undef_map, current_value.m) < 0)
 	  /* Something went wrong.  Perhaps the object we tried to reference
 	     was just removed.  Try finding another definition.  */
-	  return INT(_dl_lookup_symbol) (undef_name, undef_map, ref,
-					 symbol_scope, type_class, 0);
+	  return INTUSE(_dl_lookup_symbol) (undef_name, undef_map, ref,
+					    symbol_scope, type_class, 0);
 
 	break;
       }
@@ -402,9 +402,9 @@ _dl_lookup_versioned_symbol (const char *undef_name,
 	      && add_dependency (undef_map, current_value.m) < 0)
 	    /* Something went wrong.  Perhaps the object we tried to reference
 	       was just removed.  Try finding another definition.  */
-	    return INT(_dl_lookup_versioned_symbol) (undef_name, undef_map,
-						     ref, symbol_scope,
-						     version, type_class, 0);
+	    return INTUSE(_dl_lookup_versioned_symbol) (undef_name, undef_map,
+							ref, symbol_scope,
+							version, type_class, 0);
 
 	  break;
 	}
@@ -600,14 +600,14 @@ _dl_debug_bindings (const char *undef_name, struct link_map *undef_map,
 
   if (GL(dl_debug_mask) & DL_DEBUG_BINDINGS)
     {
-      INT(_dl_debug_printf) ("binding file %s to %s: %s symbol `%s'",
-			     (reference_name[0]
-			      ? reference_name
-			      : (_dl_argv[0] ?: "<main program>")),
-			     value->m->l_name[0]
-			     ? value->m->l_name : _dl_argv[0],
-			     protected ? "protected" : "normal",
-			     undef_name);
+      INTUSE(_dl_debug_printf) ("binding file %s to %s: %s symbol `%s'",
+				(reference_name[0]
+				 ? reference_name
+				 : (_dl_argv[0] ?: "<main program>")),
+				value->m->l_name[0]
+				? value->m->l_name : _dl_argv[0],
+				protected ? "protected" : "normal",
+				undef_name);
       if (version)
 	_dl_debug_printf_c (" [%s]\n", version->name);
       else
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index be5d8b68ad..de4639a3d0 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -87,18 +87,18 @@ fixup (
 
 	    if (version->hash != 0)
 	      {
-		result = INT(_dl_lookup_versioned_symbol) (strtab
-							   + sym->st_name,
-							   l, &sym, l->l_scope,
-							   version,
-							   ELF_RTYPE_CLASS_PLT,
-							   0);
+		result = INTUSE(_dl_lookup_versioned_symbol) (strtab
+							      + sym->st_name,
+							      l, &sym, l->l_scope,
+							      version,
+							      ELF_RTYPE_CLASS_PLT,
+							      0);
 		break;
 	      }
 	  }
 	case 0:
-	  result = INT(_dl_lookup_symbol) (strtab + sym->st_name, l, &sym,
-					   l->l_scope, ELF_RTYPE_CLASS_PLT, 0);
+	  result = INTUSE(_dl_lookup_symbol) (strtab + sym->st_name, l, &sym,
+					      l->l_scope, ELF_RTYPE_CLASS_PLT, 0);
 	}
 
       /* Currently result contains the base load address (or link map)
@@ -181,20 +181,20 @@ profile_fixup (
 
 		if (version->hash != 0)
 		  {
-		    result = INT(_dl_lookup_versioned_symbol) (strtab
-							       + sym->st_name,
-							       l, &sym,
-							       l->l_scope,
-							       version,
-							       ELF_RTYPE_CLASS_PLT,
-							       0);
+		    result = INTUSE(_dl_lookup_versioned_symbol) (strtab
+								  + sym->st_name,
+								  l, &sym,
+								  l->l_scope,
+								  version,
+								  ELF_RTYPE_CLASS_PLT,
+								  0);
 		    break;
 		  }
 	      }
 	    case 0:
-	      result = INT(_dl_lookup_symbol) (strtab + sym->st_name, l, &sym,
-					       l->l_scope, ELF_RTYPE_CLASS_PLT,
-					       0);
+	      result = INTUSE(_dl_lookup_symbol) (strtab + sym->st_name, l, &sym,
+						  l->l_scope, ELF_RTYPE_CLASS_PLT,
+						  0);
 	    }
 
 	  /* Currently result contains the base load address (or link map)
diff --git a/elf/do-lookup.h b/elf/do-lookup.h
index c42c93ae27..c316159fe1 100644
--- a/elf/do-lookup.h
+++ b/elf/do-lookup.h
@@ -61,8 +61,8 @@ FCT (const char *undef_name, unsigned long int hash, const ElfW(Sym) *ref,
 
       /* Print some debugging info if wanted.  */
       if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_SYMBOLS, 0))
-	INT(_dl_debug_printf) ("symbol=%s;  lookup in file=%s\n", undef_name,
-			       map->l_name[0] ? map->l_name : _dl_argv[0]);
+	INTUSE(_dl_debug_printf) ("symbol=%s;  lookup in file=%s\n", undef_name,
+				  map->l_name[0] ? map->l_name : _dl_argv[0]);
 
       symtab = (const void *) D_PTR (map, l_info[DT_SYMTAB]);
       strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);