about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2012-05-16 22:05:58 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2012-05-18 11:59:44 +0200
commitb53ef01aa25acc4c4f0b41dd120e90d6eb69e370 (patch)
treec4ac2ab3480acb745f32f805da4edade8a09ed32 /sysdeps
parent7a185db2b7f9853d35fbd1396a56d0c7a64b4bd9 (diff)
downloadglibc-b53ef01aa25acc4c4f0b41dd120e90d6eb69e370.tar.gz
glibc-b53ef01aa25acc4c4f0b41dd120e90d6eb69e370.tar.xz
glibc-b53ef01aa25acc4c4f0b41dd120e90d6eb69e370.zip
Fix undefined reference to _dl_prof_resolve in profiled libc
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/powerpc/powerpc32/dl-machine.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/sysdeps/powerpc/powerpc32/dl-machine.c b/sysdeps/powerpc/powerpc32/dl-machine.c
index e535480133..26c38fdd72 100644
--- a/sysdeps/powerpc/powerpc32/dl-machine.c
+++ b/sysdeps/powerpc/powerpc32/dl-machine.c
@@ -1,5 +1,5 @@
 /* Machine-dependent ELF dynamic relocation functions.  PowerPC version.
-   Copyright (C) 1995-2006, 2008, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -235,16 +235,21 @@ __elf_machine_runtime_setup (struct link_map *map, int lazy, int profile)
       if (lazy)
 	{
 	  Elf32_Word *tramp = plt + PLT_TRAMPOLINE_ENTRY_WORDS;
-	  Elf32_Word dlrr = (Elf32_Word)(profile
-					 ? _dl_prof_resolve
-					 : _dl_runtime_resolve);
+	  Elf32_Word dlrr;
 	  Elf32_Word offset;
 
+#ifndef PROF
+	  dlrr = (Elf32_Word) (profile
+			       ? _dl_prof_resolve
+			       : _dl_runtime_resolve);
 	  if (profile && GLRO(dl_profile) != NULL
 	      && _dl_name_match_p (GLRO(dl_profile), map))
 	    /* This is the object we are looking for.  Say that we really
 	       want profiling and the timers are started.  */
 	    GL(dl_profile_map) = map;
+#else
+	  dlrr = (Elf32_Word) _dl_runtime_resolve;
+#endif
 
 	  /* For the long entries, subtract off data_words.  */
 	  tramp[0] = OPCODE_ADDIS_HI (11, 11, -data_words);