summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-10-30 22:09:42 +0000
committerEric Andersen <andersen@codepoet.org>2000-10-30 22:09:42 +0000
commitcedfee12f7d479bb5d7f3245d4cdac3038d2fb50 (patch)
treef02ffa926ad84eef09f5b7549a472a189d0e4710 /libc
parente6c08ea6437471b025b940944555ddc6f115c1b2 (diff)
Fix symbol problem. Add in arm support -- might even work...
Diffstat (limited to 'libc')
-rw-r--r--libc/sysdeps/linux/arm/Makefile2
-rw-r--r--libc/sysdeps/linux/arm/longjmp.S35
-rw-r--r--libc/sysdeps/linux/arm/setjmp.S39
-rw-r--r--libc/sysdeps/linux/i386/setjmp.S2
4 files changed, 76 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile
index 8c7cd9b1a..bd789669e 100644
--- a/libc/sysdeps/linux/arm/Makefile
+++ b/libc/sysdeps/linux/arm/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)Rules.mak
LIBC=$(TOPDIR)libc.a
ASFLAGS=$(CFLAGS)
-SSRC=_start.S
+SSRC=_start.S longjmp.S setjmp.S
SOBJS=$(patsubst %.S,%.o, $(SSRC))
CSRC=
diff --git a/libc/sysdeps/linux/arm/longjmp.S b/libc/sysdeps/linux/arm/longjmp.S
new file mode 100644
index 000000000..1819c3452
--- /dev/null
+++ b/libc/sysdeps/linux/arm/longjmp.S
@@ -0,0 +1,35 @@
+/* longjmp for ARM.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#define _SETJMP_H
+#define _ASM
+#include <bits/setjmp.h>
+
+/* __longjmp(jmpbuf, val) */
+
+.globl longjmp;
+.align 4; \
+longjmp:
+ mov ip, r0
+ movs r0, r1 /* get the return value in place */
+ moveq r0, #1 /* can't let setjmp() return zero! */
+
+ ldmia ip,{v1-v6, sl, fp, sp, pc}
+.size longjmp,.-longjmp;
+
diff --git a/libc/sysdeps/linux/arm/setjmp.S b/libc/sysdeps/linux/arm/setjmp.S
new file mode 100644
index 000000000..979c182db
--- /dev/null
+++ b/libc/sysdeps/linux/arm/setjmp.S
@@ -0,0 +1,39 @@
+/* setjmp for ARM.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#define _SETJMP_H
+#define _ASM
+#include <bits/setjmp.h>
+
+ /* Binary compatibility entry point. */
+.globl setjmp;
+.align 4; \
+setjmp:
+ mov r1, #0
+
+
+.globl sigsetjmp;
+.align 4; \
+sigsetjmp:
+ /* Save registers */
+ stmia r0, {v1-v6, sl, fp, sp, lr}
+
+ /* Make a tail call to __sigjmp_save; it takes the same args. */
+ B __sigjmp_save
+.size setjmp,.-setjmp;
diff --git a/libc/sysdeps/linux/i386/setjmp.S b/libc/sysdeps/linux/i386/setjmp.S
index 466fed2ba..b96796eca 100644
--- a/libc/sysdeps/linux/i386/setjmp.S
+++ b/libc/sysdeps/linux/i386/setjmp.S
@@ -54,7 +54,7 @@ __sigsetjmp:
L(here):
popl %ecx
addl $_GLOBAL_OFFSET_TABLE_+[.-L(here)], %ecx
- movl C_SYMBOL_NAME(__sigjmp_save@GOT)(%ecx), %ecx
+ movl (__sigjmp_save)(%ecx), %ecx
jmp *%ecx
#else
jmp __sigjmp_save