diff options
author | Mike Smith <msmith@FreeBSD.org> | 1998-11-04 07:39:53 +0000 |
---|---|---|
committer | Mike Smith <msmith@FreeBSD.org> | 1998-11-04 07:39:53 +0000 |
commit | b8ffd2a51c84f59ad2840c621a3f2ead3f70fe97 (patch) | |
tree | cdd19008b79c5e68b1f06f93fbe954d3430d2314 /lib/libstand | |
parent | 2cd5cac4ec9e5e02e931cc817995a6ba3fea2ebc (diff) | |
download | src-b8ffd2a51c84f59ad2840c621a3f2ead3f70fe97.tar.gz src-b8ffd2a51c84f59ad2840c621a3f2ead3f70fe97.zip |
Well I never. Seems like _setjmp()/_longjmp() are just what the doctor
ordered. This brings the Alpha back to parity, and should bring us
BootForth on both platforms.
Submitted by: John Birrell (jb@freebsd.org)
Notes
Notes:
svn path=/head/; revision=40891
Diffstat (limited to 'lib/libstand')
-rw-r--r-- | lib/libstand/Makefile | 10 | ||||
-rw-r--r-- | lib/libstand/libstand.3 | 8 | ||||
-rw-r--r-- | lib/libstand/stand.h | 6 |
3 files changed, 16 insertions, 8 deletions
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile index 78e24c4d34da..fe4d3436cbc8 100644 --- a/lib/libstand/Makefile +++ b/lib/libstand/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.8 1998/11/04 00:23:11 msmith Exp $ +# $Id: Makefile,v 1.9 1998/11/04 00:32:08 msmith Exp $ # # Originally from $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $ # @@ -90,11 +90,11 @@ __reml.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 .PATH: ${.CURDIR}/../libc/net SRCS+= inet_ntoa.c inet_addr.c -# setjmp/longjmp -.if ${MACHINE_ARCH} == "i386" -.PATH: ${.CURDIR}/${MACHINE_ARCH} +# _setjmp/_longjmp +.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen +SRCS+= _setjmp.S +# really only required for i386 CFLAGS+=-I${.CURDIR}/../libc/${MACHINE_ARCH} -SRCS+= setjmp.S .endif # decompression functionality from libz diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3 index ae04323308d2..aa5365ed43d7 100644 --- a/lib/libstand/libstand.3 +++ b/lib/libstand/libstand.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: libstand.3,v 1.1.1.1 1998/08/20 08:19:55 msmith Exp $ +.\" $Id: libstand.3,v 1.2 1998/11/01 09:31:08 msmith Exp $ .\" .Dd June 22, 1998 .Dt LIBSTAND 3 @@ -131,7 +131,11 @@ Requires .It Fn "int setjmp" "jmp_buf env" .It Fn "void longjmp" "jmp_buf env" "int val" .Pp -Require +Defined as +.Fn _setjmp +and +.Fn _lonjmp +respectively as there is no signal state to manipulate. Requires .Fd #include <setjmp.h> .El .Sh CHARACTER I/O diff --git a/lib/libstand/stand.h b/lib/libstand/stand.h index 24d6ab7d551b..c527bf7d5173 100644 --- a/lib/libstand/stand.h +++ b/lib/libstand/stand.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: stand.h,v 1.10 1998/11/01 09:31:08 msmith Exp $ + * $Id: stand.h,v 1.11 1998/11/04 07:04:00 msmith Exp $ * From $NetBSD: stand.h,v 1.22 1997/06/26 19:17:40 drochner Exp $ */ @@ -229,6 +229,10 @@ extern void pager_close(void); extern int pager_output(const char *lines); extern int pager_file(const char *fname); +/* No signal state to preserve */ +#define setjmp _setjmp +#define longjmp _longjmp + /* environment.c */ #define EV_DYNAMIC (1<<0) /* value was dynamically allocated, free if changed/unset */ #define EV_VOLATILE (1<<1) /* value is volatile, make a copy of it */ |