mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-03 22:53:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ARMv4T interworking.

Browse Source 
* sysdeps/unix/sysv/linux/arm/clone.S: Support V4T interworking.
        * sysdeps/unix/sysv/linux/arm/sysdep.h (__local_syscall_error): Likewise.
        * sysdeps/arm/memcpy.S: Likewise.
        * sysdeps/arm/memmove.S: Likewise.
This commit is contained in:
Philip Blundell 2009-11-06 08:07:18 +00:00
parent cb182378d7
commit b2b2415fe0
5 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog.arm
View File

@ -1,3 +1,10 @@
2009-11-04 Philip Blundell <philb@gnu.org>
* sysdeps/unix/sysv/linux/arm/clone.S: Support V4T interworking.
* sysdeps/unix/sysv/linux/arm/sysdep.h (__local_syscall_error): Likewise.
* sysdeps/arm/memcpy.S: Likewise.
* sysdeps/arm/memmove.S: Likewise.
2009-10-29 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/arm/bits/fcntl.h: Define F_OWNER_* and

7
sysdeps/arm/memcpy.S
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2006 Free Software Foundation, Inc.
/* Copyright (C) 2006, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by MontaVista Software, Inc. (written by Nicolas Pitre)
@ -130,7 +130,12 @@ ENTRY(memcpy)
strcsb r4, [r0], #1
strcsb ip, [r0]
#if defined (__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
ldmfd sp!, {r0, r4, lr}
bx lr
#else
ldmfd sp!, {r0, r4, pc}
#endif
9: rsb ip, ip, #4
cmp ip, #2

7
sysdeps/arm/memmove.S
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2006, 2008 Free Software Foundation, Inc.
/* Copyright (C) 2006, 2008, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by MontaVista Software, Inc. (written by Nicolas Pitre)
@ -144,7 +144,12 @@ ENTRY(memmove)
strneb r3, [r0, #-1]!
strcsb r4, [r0, #-1]!
strcsb ip, [r0, #-1]
#if defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__)
ldmfd sp!, {r0, r4, lr}
bx lr
#else
ldmfd sp!, {r0, r4, pc}
#endif
9: cmp ip, #2
ldrgtb r3, [r1, #-1]!

8
sysdeps/unix/sysv/linux/arm/clone.S
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1996, 1997, 1998, 1999, 2002, 2005, 2008
/* Copyright (C) 1996, 1997, 1998, 1999, 2002, 2005, 2008, 2009
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Pat Beirne <patb@corelcomputer.com>
@ -96,8 +96,14 @@ ENTRY(__clone)
#endif
@ pick the function arg and call address off the stack and execute
ldr r0, [sp, #4]
#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
ldr ip, [sp], #8
mov lr, pc
bx ip
#else
mov lr, pc
ldr pc, [sp], #8
#endif
@ and we are done, passing the return value through r0
b PLTJMP(HIDDEN_JUMPTARGET(_exit))

9
sysdeps/unix/sysv/linux/arm/sysdep.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1992, 93, 1995-2000, 2002, 2003, 2005, 2006
/* Copyright (C) 1992, 93, 1995-2000, 2002, 2003, 2005, 2006, 2009
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>, August 1995.
@ -129,6 +129,11 @@ __local_syscall_error: \
DO_RET(lr); \
1: .word C_SYMBOL_NAME(rtld_errno) - 0b - 8;
# else
#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__)
#define POP_PC ldr lr, [sp], #4; bx lr
#else
#define POP_PC ldr pc, [sp], #4
#endif
# define SYSCALL_ERROR_HANDLER \
__local_syscall_error: \
str lr, [sp, #-4]!; \
@ -138,7 +143,7 @@ __local_syscall_error: \
rsb r1, r1, #0; \
str r1, [r0]; \
mvn r0, #0; \
ldr pc, [sp], #4;
POP_PC;
# endif
#else
# define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */