about summary refs log tree commit diff
path: root/elf/dl-lookup.c
diff options
context:
space:
mode:
Diffstat (limited to 'elf/dl-lookup.c')
-rw-r--r--elf/dl-lookup.c39
1 files changed, 22 insertions, 17 deletions
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 4f3285fee5..49ee42ad3c 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))
-	_dl_debug_printf ("\
+	INT(_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.  */
@@ -203,8 +203,9 @@ static void
 internal_function
 _dl_debug_bindings (const char *undef_name, struct link_map *undef_map,
 		    const ElfW(Sym) **ref, struct r_scope_elem *symbol_scope[],
-		    struct sym_val *value, const struct r_found_version *version,
-		    int type_class, int protected);
+		    struct sym_val *value,
+		    const struct r_found_version *version, int type_class,
+		    int protected);
 
 /* Search loaded objects' symbol tables for a definition of the symbol
    UNDEF_NAME.  */
@@ -239,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 _dl_lookup_symbol (undef_name, undef_map, ref, symbol_scope,
-				    type_class, 0);
+	  return INT(_dl_lookup_symbol) (undef_name, undef_map, ref,
+					 symbol_scope, type_class, 0);
 
 	break;
       }
@@ -288,6 +289,7 @@ _dl_lookup_symbol (const char *undef_name, struct link_map *undef_map,
   *ref = current_value.s;
   return LOOKUP_VALUE (current_value.m);
 }
+INTDEF (_dl_lookup_symbol)
 
 
 /* This function is nearly the same as `_dl_lookup_symbol' but it
@@ -400,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 _dl_lookup_versioned_symbol (undef_name, undef_map, ref,
-						symbol_scope, version,
-						type_class, 0);
+	    return INT(_dl_lookup_versioned_symbol) (undef_name, undef_map,
+						     ref, symbol_scope,
+						     version, type_class, 0);
 
 	  break;
 	}
@@ -478,6 +480,7 @@ _dl_lookup_versioned_symbol (const char *undef_name,
   *ref = current_value.s;
   return LOOKUP_VALUE (current_value.m);
 }
+INTDEF (_dl_lookup_versioned_symbol)
 
 
 /* Similar to _dl_lookup_symbol_skip but takes an additional argument
@@ -597,12 +600,14 @@ _dl_debug_bindings (const char *undef_name, struct link_map *undef_map,
 
   if (GL(dl_debug_mask) & DL_DEBUG_BINDINGS)
     {
-      _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);
+      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);
       if (version)
 	_dl_debug_printf_c (" [%s]\n", version->name);
       else