diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2012-05-01 17:10:10 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2012-07-06 23:43:56 +0200 |
| commit | 261f485936b283f4327fc1f2fc8fd1705d805c12 (patch) | |
| tree | a21e7557201769629cb26e3bbb8069e53fed81d4 | |
| parent | 9ad63c23eabdec1b625b1217b6635f34268ca342 (diff) | |
| download | glibc-261f485936b283f4327fc1f2fc8fd1705d805c12.tar.gz glibc-261f485936b283f4327fc1f2fc8fd1705d805c12.tar.xz glibc-261f485936b283f4327fc1f2fc8fd1705d805c12.zip | |
Fix missing _mcount@GLIBC_2.0 on powerpc32
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/compat-ppc-mcount.S | 11 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/ppc-mcount.S | 6 |
4 files changed, 27 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index b48897fc7a..06226b9147 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-07-06 Andreas Schwab <schwab@linux-m68k.org> + + [BZ #14042] + * sysdeps/powerpc/powerpc32/ppc-mcount.S [SHARED]: Don't use PLT + for call to __mcount_internal. + * sysdeps/powerpc/powerpc32/Makefile (sysdep_routines) + (shared-only-routines) [$(subdir) = gmon]: Add compat-ppc-mcount. + * sysdeps/powerpc/powerpc32/compat-ppc-mcount.S: New file. + 2012-07-06 Joseph Myers <joseph@codesourcery.com> [BZ #14154] diff --git a/sysdeps/powerpc/powerpc32/Makefile b/sysdeps/powerpc/powerpc32/Makefile index aa2d0b9fb8..64f79003af 100644 --- a/sysdeps/powerpc/powerpc32/Makefile +++ b/sysdeps/powerpc/powerpc32/Makefile @@ -6,8 +6,9 @@ sysdep-LDFLAGS += -msoft-float endif ifeq ($(subdir),gmon) -sysdep_routines += ppc-mcount +sysdep_routines += ppc-mcount compat-ppc-mcount static-only-routines += ppc-mcount +shared-only-routines += compat-ppc-mcount endif ifeq ($(subdir),misc) diff --git a/sysdeps/powerpc/powerpc32/compat-ppc-mcount.S b/sysdeps/powerpc/powerpc32/compat-ppc-mcount.S new file mode 100644 index 0000000000..2a9cb24072 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/compat-ppc-mcount.S @@ -0,0 +1,11 @@ +#include <shlib-compat.h> + +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_15) + + compat_text_section +# define _mcount __compat_mcount +# include "ppc-mcount.S" +# undef _mcount + +compat_symbol (libc, __compat_mcount, _mcount, GLIBC_2_0) +#endif diff --git a/sysdeps/powerpc/powerpc32/ppc-mcount.S b/sysdeps/powerpc/powerpc32/ppc-mcount.S index 9a3c041dd6..911638b5b9 100644 --- a/sysdeps/powerpc/powerpc32/ppc-mcount.S +++ b/sysdeps/powerpc/powerpc32/ppc-mcount.S @@ -1,5 +1,5 @@ /* PowerPC-specific implementation of profiling support. - Copyright (C) 1997, 1999, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-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 @@ -57,7 +57,11 @@ ENTRY(_mcount) stw r4, 44(r1) cfi_offset (lr, -4) stw r5, 8(r1) +#ifndef SHARED bl JUMPTARGET(__mcount_internal) +#else + bl __mcount_internal@local +#endif /* Restore the registers... */ lwz r6, 8(r1) lwz r0, 44(r1) |