Module Name: src
Committed By: christos
Date: Thu Jan 23 03:08:50 UTC 2014
Modified Files:
src/lib/libc/arch/alpha/gen: __setjmp14.S
src/lib/libc/compat/arch/alpha/gen: compat__setjmp.S compat_setjmp.S
Log Message:
Use a constant in the text segment to avoid the .lit8 out of range relocation
error.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/alpha/gen/__setjmp14.S
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/arch/alpha/gen/compat__setjmp.S \
src/lib/libc/compat/arch/alpha/gen/compat_setjmp.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/alpha/gen/__setjmp14.S
diff -u src/lib/libc/arch/alpha/gen/__setjmp14.S:1.6 src/lib/libc/arch/alpha/gen/__setjmp14.S:1.7
--- src/lib/libc/arch/alpha/gen/__setjmp14.S:1.6 Tue Mar 12 15:38:20 2013
+++ src/lib/libc/arch/alpha/gen/__setjmp14.S Wed Jan 22 22:08:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: __setjmp14.S,v 1.6 2013/03/12 19:38:20 martin Exp $ */
+/* $NetBSD: __setjmp14.S,v 1.7 2014/01/23 03:08:50 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -84,7 +84,7 @@ LEAF(__setjmp14, 1)
mov s0, a0
ldq s0, (SC_REGS+_REG_S0)(a0)
- ldiq t0, 0xacedbade /* sigcontext magic number */
+ ldq t0, magic /* sigcontext magic number */
stq t0, (SC_REGS+_REG_UNIQUE)(a0) /* magic in sc_regs[31] */
/* Too bad we can't check if we actually used FP */
ldiq t0, 1
@@ -118,4 +118,6 @@ LEAF(__setjmp14, 1)
botch:
CALL(abort)
RET /* "can't" get here... */
+magic:
+ .quad 0xacedbade /* sigcontext magic number */
END(__setjmp14)
Index: src/lib/libc/compat/arch/alpha/gen/compat__setjmp.S
diff -u src/lib/libc/compat/arch/alpha/gen/compat__setjmp.S:1.1 src/lib/libc/compat/arch/alpha/gen/compat__setjmp.S:1.2
--- src/lib/libc/compat/arch/alpha/gen/compat__setjmp.S:1.1 Fri Sep 16 14:21:19 2005
+++ src/lib/libc/compat/arch/alpha/gen/compat__setjmp.S Wed Jan 22 22:08:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: compat__setjmp.S,v 1.1 2005/09/16 18:21:19 drochner Exp $ */
+/* $NetBSD: compat__setjmp.S,v 1.2 2014/01/23 03:08:50 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -54,7 +54,8 @@ LEAF(_setjmp, 1)
stq s6, ((15 + 4) * 8)(a0)
stq ra, ((26 + 4) * 8)(a0)
stq sp, ((30 + 4) * 8)(a0)
- ldiq t0, 0xacedbadd /* sigcontext magic number */
+ /* work around assembler issue */
+ ldq t0, magic /* sigcontext magic number */
stq t0, ((31 + 4) * 8)(a0) /* magic in sc_regs[31] */
/* Too bad we can't check if we actually used FP */
ldiq t0, 1
@@ -83,12 +84,15 @@ LEAF(_setjmp, 1)
mov zero, v0 /* return zero */
RET
+magic:
+ .quad 0xacedbadd
END(_setjmp)
LEAF(_longjmp, 2)
LDGP(pv)
ldq t0, ((31 + 4) * 8)(a0) /* magic in sc_regs[31] */
- ldiq t1, 0xacedbadd
+ /* work around assembler issue */
+ ldq t0, magic /* sigcontext magic number */
cmpeq t0, t1, t0
beq t0, botch /* If the magic was bad, punt */
Index: src/lib/libc/compat/arch/alpha/gen/compat_setjmp.S
diff -u src/lib/libc/compat/arch/alpha/gen/compat_setjmp.S:1.1 src/lib/libc/compat/arch/alpha/gen/compat_setjmp.S:1.2
--- src/lib/libc/compat/arch/alpha/gen/compat_setjmp.S:1.1 Fri Sep 16 14:21:19 2005
+++ src/lib/libc/compat/arch/alpha/gen/compat_setjmp.S Wed Jan 22 22:08:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_setjmp.S,v 1.1 2005/09/16 18:21:19 drochner Exp $ */
+/* $NetBSD: compat_setjmp.S,v 1.2 2014/01/23 03:08:50 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -81,7 +81,7 @@ LEAF(setjmp, 1)
mov s0, a0
ldq s0, (( 9 + 4) * 8)(a0)
- ldiq t0, 0xacedbade /* sigcontext magic number */
+ ldq t0, magic /* sigcontext magic number */
stq t0, ((31 + 4) * 8)(a0) /* magic in sc_regs[31] */
/* Too bad we can't check if we actually used FP */
ldiq t0, 1
@@ -121,4 +121,6 @@ botch:
CALL(longjmperror)
CALL(abort)
RET /* "can't" get here... */
+magic:
+ .quad 0xacedbade /* sigcontext magic number */
END(longjmp)
