[git commit master] don't use __i686 in symbol names as it seems gcc can define it
Austin Foxley
austinf at cetoncorp.com
Fri Apr 23 14:31:55 UTC 2010
commit: http://git.uclibc.org/uClibc/commit/?id=9a7506e8952851c5aea4471d02fd83c4ba334901
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
libpthread/nptl/sysdeps/i386/sysdep.h | 17 +++++++++--------
.../sysdeps/unix/sysv/linux/i386/i486/sem_post.S | 14 +++++++-------
.../unix/sysv/linux/i386/i486/sem_timedwait.S | 2 +-
.../unix/sysv/linux/i386/i486/sem_trywait.S | 16 ++++++++--------
.../sysdeps/unix/sysv/linux/i386/i486/sem_wait.S | 2 +-
.../sysdeps/unix/sysv/linux/i386/pthread_once.S | 14 +++++++-------
6 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/libpthread/nptl/sysdeps/i386/sysdep.h b/libpthread/nptl/sysdeps/i386/sysdep.h
index 7f27890..c52df2d 100644
--- a/libpthread/nptl/sysdeps/i386/sysdep.h
+++ b/libpthread/nptl/sysdeps/i386/sysdep.h
@@ -122,19 +122,20 @@ lose: SYSCALL_PIC_SETUP \
cfi_adjust_cfa_offset (-4); \
addl $_GLOBAL_OFFSET_TABLE+[.-0b], %ebx;
+
# define SETUP_PIC_REG(reg) \
- .ifndef __i686.get_pc_thunk.reg; \
- .section .gnu.linkonce.t.__i686.get_pc_thunk.reg,"ax", at progbits; \
- .globl __i686.get_pc_thunk.reg; \
- .hidden __i686.get_pc_thunk.reg; \
- .type __i686.get_pc_thunk.reg, at function; \
-__i686.get_pc_thunk.reg: \
+ .ifndef __x86.get_pc_thunk.reg; \
+ .section .gnu.linkonce.t.__x86.get_pc_thunk.reg,"ax", at progbits; \
+ .globl __x86.get_pc_thunk.reg; \
+ .hidden __x86.get_pc_thunk.reg; \
+ .type __x86.get_pc_thunk.reg, at function; \
+__x86.get_pc_thunk.reg: \
movl (%esp), %e##reg; \
ret; \
- .size __i686.get_pc_thunk.reg, . - __i686.get_pc_thunk.reg; \
+ .size __x86.get_pc_thunk.reg, . - __x86.get_pc_thunk.reg; \
.previous; \
.endif; \
- call __i686.get_pc_thunk.reg
+ call __x86.get_pc_thunk.reg
# define LOAD_PIC_REG(reg) \
SETUP_PIC_REG(reg); addl $_GLOBAL_OFFSET_TABLE_, %e##reg
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
index 82f24c2..de057c8 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S
@@ -57,7 +57,7 @@ __new_sem_post:
1:
#ifdef PIC
- call __i686.get_pc_thunk.bx
+ call __x86.get_pc_thunk.bx
#else
movl $4f, %ebx
4:
@@ -85,12 +85,12 @@ weak_alias(__new_sem_post, sem_post)
#ifdef PIC
- .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax", at progbits
- .globl __i686.get_pc_thunk.bx
- .hidden __i686.get_pc_thunk.bx
- .type __i686.get_pc_thunk.bx, at function
-__i686.get_pc_thunk.bx:
+ .section .gnu.linkonce.t.__x86.get_pc_thunk.bx,"ax", at progbits
+ .globl __x86.get_pc_thunk.bx
+ .hidden __x86.get_pc_thunk.bx
+ .type __x86.get_pc_thunk.bx, at function
+__x86.get_pc_thunk.bx:
movl (%esp), %ebx;
ret
- .size __i686.get_pc_thunk.bx,.-__i686.get_pc_thunk.bx
+ .size __x86.get_pc_thunk.bx,.-__x86.get_pc_thunk.bx
#endif
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
index f306e40..278b42a 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
@@ -149,7 +149,7 @@ sem_timedwait:
3: negl %esi
6:
#ifdef PIC
- call __i686.get_pc_thunk.bx
+ call __x86.get_pc_thunk.bx
#else
movl $4f, %ebx
4:
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
index 1fd5186..6947c0d 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
@@ -48,8 +48,8 @@ __new_sem_trywait:
1:
#ifdef PIC
- call __i686.get_pc_thunk.cx
-#else
+ call __x86.get_pc_thunk.cx
+#elsen
movl $3f, %ecx
3:
#endif
@@ -74,12 +74,12 @@ weak_alias(__new_sem_trywait, sem_trywait)
#ifdef PIC
- .section .gnu.linkonce.t.__i686.get_pc_thunk.cx,"ax", at progbits
- .globl __i686.get_pc_thunk.cx
- .hidden __i686.get_pc_thunk.cx
- .type __i686.get_pc_thunk.cx, at function
-__i686.get_pc_thunk.cx:
+ .section .gnu.linkonce.t.__x86.get_pc_thunk.cx,"ax", at progbits
+ .globl __x86.get_pc_thunk.cx
+ .hidden __x86.get_pc_thunk.cx
+ .type __x86.get_pc_thunk.cx, at function
+__x86.get_pc_thunk.cx:
movl (%esp), %ecx;
ret
- .size __i686.get_pc_thunk.cx,.-__i686.get_pc_thunk.cx
+ .size __x86.get_pc_thunk.cx,.-__x86.get_pc_thunk.cx
#endif
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
index baae429..0536306 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
@@ -95,7 +95,7 @@ __new_sem_wait:
je 3b
negl %esi
#ifdef PIC
- call __i686.get_pc_thunk.bx
+ call __x86.get_pc_thunk.bx
#else
movl $4f, %ebx
4:
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S
index 97b4afb..afdb1c5 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/pthread_once.S
@@ -57,7 +57,7 @@ __pthread_once:
Get the fork generation counter now. */
6: movl (%ebx), %eax
#ifdef PIC
- call __i686.get_pc_thunk.cx
+ call __x86.get_pc_thunk.cx
addl $_GLOBAL_OFFSET_TABLE_, %ecx
#endif
@@ -170,12 +170,12 @@ pthread_once = __pthread_once
#ifdef PIC
- .section .gnu.linkonce.t.__i686.get_pc_thunk.cx,"ax", at progbits
- .globl __i686.get_pc_thunk.cx
- .hidden __i686.get_pc_thunk.cx
- .type __i686.get_pc_thunk.cx, at function
-__i686.get_pc_thunk.cx:
+ .section .gnu.linkonce.t.__x86.get_pc_thunk.cx,"ax", at progbits
+ .globl __x86.get_pc_thunk.cx
+ .hidden __x86.get_pc_thunk.cx
+ .type __x86.get_pc_thunk.cx, at function
+__x86.get_pc_thunk.cx:
movl (%esp), %ecx;
ret
- .size __i686.get_pc_thunk.cx,.-__i686.get_pc_thunk.cx
+ .size __x86.get_pc_thunk.cx,.-__x86.get_pc_thunk.cx
#endif
--
1.6.3.3
More information about the uClibc-cvs
mailing list