diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-18 13:49:32 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-08-18 13:49:32 +0000 |
| commit | 081c531fecfa27b5c0e9f48a3ca1a96ea3ef553c (patch) | |
| tree | 9e151374b53ad61b9c5407d4cc4f8e8fd8ec3c24 /main/gcc/gcc-libgcc-x86.get_pc_thunk.bx.patch | |
| parent | de7b37cbad5d595786fa1b78bed8dac552de1b27 (diff) | |
| download | aports-081c531fecfa27b5c0e9f48a3ca1a96ea3ef553c.tar.bz2 aports-081c531fecfa27b5c0e9f48a3ca1a96ea3ef553c.tar.xz | |
main/gcc: upgrade to 4.6.1
Diffstat (limited to 'main/gcc/gcc-libgcc-x86.get_pc_thunk.bx.patch')
| -rw-r--r-- | main/gcc/gcc-libgcc-x86.get_pc_thunk.bx.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/main/gcc/gcc-libgcc-x86.get_pc_thunk.bx.patch b/main/gcc/gcc-libgcc-x86.get_pc_thunk.bx.patch new file mode 100644 index 0000000000..551e6150ab --- /dev/null +++ b/main/gcc/gcc-libgcc-x86.get_pc_thunk.bx.patch @@ -0,0 +1,38 @@ +Index: libgcc/config/i386/morestack.S +=================================================================== +--- ./libgcc/config/i386/morestack.S (revision 173993) ++++ ./libgcc/config/i386/morestack.S (revision 173994) +@@ -278,8 +278,7 @@ + movl 4(%esp),%eax # Function argument. + movl %eax,(%esp) + #ifdef __PIC__ +-#undef __i686 +- call __i686.get_pc_thunk.bx # %ebx may not be set up for us. ++ call __x86.get_pc_thunk.bx # %ebx may not be set up for us. + addl $_GLOBAL_OFFSET_TABLE_, %ebx + call _Unwind_Resume@PLT # Resume unwinding. + #else +@@ -449,6 +448,23 @@ + .size __morestack, . - __morestack + #endif + ++#if !defined(__x86_64__) && defined(__PIC__) ++# Output the thunk to get PC into bx, since we use it above. ++ .section .text.__x86.get_pc_thunk.bx,"axG",@progbits,__x86.get_pc_thunk.bx,comdat ++ .globl __x86.get_pc_thunk.bx ++ .hidden __x86.get_pc_thunk.bx ++#ifdef __ELF__ ++ .type __x86.get_pc_thunk.bx, @function ++#endif ++__x86.get_pc_thunk.bx: ++ .cfi_startproc ++ movl (%esp), %ebx ++ ret ++ .cfi_endproc ++#ifdef __ELF__ ++ .size __x86.get_pc_thunk.bx, . - __x86.get_pc_thunk.bx ++#endif ++#endif + + # The exception table. This tells the personality routine to execute + # the exception handler. |