diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-07-03 00:28:18 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-07-03 00:28:18 -0400 |
commit | e9e15c687c5ebdf64f2f0679f5a21b41062bc210 (patch) | |
tree | 53a11b091a118adb696da91d134ee91f7be8ec0e /libc/sysdeps/linux/arm | |
parent | 14276f18072accb6ad36e8d784e44ee1e1a29c56 (diff) | |
parent | eac5e6eee91332c3c98f4c5a3ee2d55ec1723d81 (diff) |
Merge branch 'master' of git://uclibc.org/uClibc
Diffstat (limited to 'libc/sysdeps/linux/arm')
-rw-r--r-- | libc/sysdeps/linux/arm/aeabi_lcsts.c | 15 | ||||
-rw-r--r-- | libc/sysdeps/linux/arm/setjmp.S | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/libc/sysdeps/linux/arm/aeabi_lcsts.c b/libc/sysdeps/linux/arm/aeabi_lcsts.c index 99c79851e..0c620d4fe 100644 --- a/libc/sysdeps/linux/arm/aeabi_lcsts.c +++ b/libc/sysdeps/linux/arm/aeabi_lcsts.c @@ -81,4 +81,19 @@ eabi_constant (TMP_MAX); eabi_constant (FILENAME_MAX); eabi_constant (L_tmpnam); +FILE *__aeabi_stdin attribute_hidden; +FILE *__aeabi_stdout attribute_hidden; +FILE *__aeabi_stderr attribute_hidden; + +static void __attribute__ ((used)) +setup_aeabi_stdio (void) +{ + __aeabi_stdin = stdin; + __aeabi_stdout = stdout; + __aeabi_stderr = stderr; +} + +static void (*fp) (void) __attribute__ ((used, section (".preinit_array"))) + = setup_aeabi_stdio; + eabi_constant (CLOCKS_PER_SEC); diff --git a/libc/sysdeps/linux/arm/setjmp.S b/libc/sysdeps/linux/arm/setjmp.S index 2df7d551a..76d179043 100644 --- a/libc/sysdeps/linux/arm/setjmp.S +++ b/libc/sysdeps/linux/arm/setjmp.S @@ -47,7 +47,7 @@ __sigsetjmp: mov ip, r0 #if defined(__thumb2__) stmia ip!, {v1-v6, sl, fp} - movs r2, sp + mov r2, sp stmia ip!, {r2, lr} #else /* Save registers */ |