diff options
author | Andreas Schwab <schwab@redhat.com> | 2010-02-22 16:34:12 +0100 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2010-02-22 16:41:22 +0100 |
commit | 2b6e16c5e2fa8ad12b02a218ba32d63a4dffda18 (patch) | |
tree | b931e143f212d5b656497bb0c3f3e3a413fc78e1 /sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S | |
parent | 0c3f133ed106996172dd2c106b22e38ce695e63d (diff) | |
parent | 199428c19774c12b3c4b6e6486ea9d4a021288af (diff) |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S')
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S index 89b1a61954..62efee2dce 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext-common.S @@ -146,15 +146,10 @@ ENTRY(__CONTEXT_FUNC_NAME) # ifdef PIC mflr r8 -# ifdef HAVE_ASM_PPC_REL16 bcl 20,31,1f 1: mflr r7 addis r7,r7,_GLOBAL_OFFSET_TABLE_-1b@ha addi r7,r7,_GLOBAL_OFFSET_TABLE_-1b@l -# else - bl _GLOBAL_OFFSET_TABLE_@local-4 - mflr r7 -# endif # ifdef SHARED lwz r7,_rtld_global_ro@got(r7) mtlr r8 |