[libgcc/ChangeLog]
2011-05-04  Chris Demetriou  <cgd@google.com>

	* config/i386/morestack.S (__i686.get_pc_thunk.bx): Rename...
	(__x86.get_pc_thunk.bx): To this.
	(__morestack): Adjust for rename, remove undef of __i686.

Index: libgcc/config/i386/morestack.S
===================================================================
--- libgcc/config/i386/morestack.S	(revision 173355)
+++ libgcc/config/i386/morestack.S	(working copy)
@@ -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
@@ -451,20 +450,19 @@
 
 #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