From a3330c9d558720697db4f6f767252335eefe89a3 Mon Sep 17 00:00:00 2001 From: Chris Demetriou Date: Wed, 4 May 2011 11:59:31 -0700 Subject: [PATCH] morestack.S (__i686.get_pc_thunk.bx): Rename to... 2011-05-04 Chris Demetriou * config/i386/morestack.S (__i686.get_pc_thunk.bx): Rename to... (__x86.get_pc_thunk.bx): ...this. (__morestack): Adjust for rename, remove undef of __i686. From-SVN: r173391 --- libgcc/ChangeLog | 6 ++++++ libgcc/config/i386/morestack.S | 16 +++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index ac99ddb7d34..b6d6b1f84a3 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +2011-05-04 Chris Demetriou + + * config/i386/morestack.S (__i686.get_pc_thunk.bx): Rename to... + (__x86.get_pc_thunk.bx): ...this. + (__morestack): Adjust for rename, remove undef of __i686. + 2011-05-03 Chris Demetriou * config/i386/morestack.S (__i686.get_pc_thunk.bx): New. diff --git a/libgcc/config/i386/morestack.S b/libgcc/config/i386/morestack.S index 5db5e502848..16279c7800c 100644 --- a/libgcc/config/i386/morestack.S +++ b/libgcc/config/i386/morestack.S @@ -278,8 +278,7 @@ __morestack: 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 @@ -451,20 +450,19 @@ __morestack: #if !defined(__x86_64__) && defined(__PIC__) # Output the thunk to get PC into bx, since we use it above. -# (__i686 was already undef'd above; don't need to worry about it here.) - .section .text.__i686.get_pc_thunk.bx,"axG",@progbits,__i686.get_pc_thunk.bx,comdat - .globl __i686.get_pc_thunk.bx - .hidden __i686.get_pc_thunk.bx + .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 __i686.get_pc_thunk.bx, @function + .type __x86.get_pc_thunk.bx, @function #endif -__i686.get_pc_thunk.bx: +__x86.get_pc_thunk.bx: .cfi_startproc movl (%esp), %ebx ret .cfi_endproc #ifdef __ELF__ - .size __i686.get_pc_thunk.bx, . - __i686.get_pc_thunk.bx + .size __x86.get_pc_thunk.bx, . - __x86.get_pc_thunk.bx #endif #endif -- 2.30.2