Update.

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

diff --git a/ChangeLog b/ChangeLog
index aef459d570fe326e6724e966f3d78b9b818115df..1f465874e652be8e3aba8abb1c688932cca0057c 100644 (file)
--- 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 a297189d77c4f21272ed992ce5bbd44071886048..71088fbe4c2f51a2fdedaed8d54febd5f326fe7c 100644 (file)
--- 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 ab6bf9c4966cfaf4e606969294985714f6999335..902ce086d9f8df9837c14d03998c1194c04a8706 100644 (file)
--- 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 49ee42ad3cb702db4e54f96634ab7759fd73a804..8de301eaa8d31b4e084c38d032e1de2c2d1d5723 100644 (file)
--- 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 be5d8b68adb2bbbde0105f4bf950b39952dab78f..de4639a3d02f5a156438d92a33ee2543787b7eed 100644 (file)
--- 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 c42c93ae27df999e05b6aaab802ac8597e791072..c316159fe1ba7a04b431f88b119b1ae343ecc9ee 100644 (file)
--- 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]);