From 76d81302250475cbca24bb3d257a446b044bc343 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Mon, 4 Mar 2002 13:40:44 +0000
Subject: Update.

2002-03-04  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/kernel-features.h: Add defines for
	x86-64.

	* sysdeps/unix/sysv/linux/x86_64/bits/socket.h: New.

	* sysdeps/unix/sysv/linux/x86_64/bits/sigcontext.h: New.

	* sysdeps/unix/sysv/linux/x86_64/bits/shm.h: New.

	* sysdeps/x86_64/bits/setjmp.h: New.

	* sysdeps/unix/sysv/linux/x86_64/bits/sem.h: New.

	* sysdeps/unix/sysv/linux/x86_64/bits/resource.h: New.

	* sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Add compatibilty
	for x86.
	* sysdeps/unix/sysv/linux/x86_64/bits/msq.h: Likewise.
	* sysdeps/unix/sysv/linux/x86_64/bits/types.h: Likewise.

2002-02-28  Bo Thorsen  <bo@suse.de>

	* sysdeps/unix/sysv/linux/x86_64/bits/stat.h: Merge with i386
	version.
---
 sysdeps/x86_64/bits/setjmp.h | 51 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 12 deletions(-)

(limited to 'sysdeps/x86_64/bits')

diff --git a/sysdeps/x86_64/bits/setjmp.h b/sysdeps/x86_64/bits/setjmp.h
index be39482d09..ba5dd2c112 100644
--- a/sysdeps/x86_64/bits/setjmp.h
+++ b/sysdeps/x86_64/bits/setjmp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002 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
@@ -22,26 +22,53 @@
 # error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
 #endif
 
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 64
+
 /* We only need to save callee-saved registers plus stackpointer and
    program counter.  */
-#if defined __USE_MISC || defined _ASM
-# define JB_RBX	0
-# define JB_RBP	1
-# define JB_R12	2
-# define JB_R13	3
-# define JB_R14	4
-# define JB_R15	5
-# define JB_RSP	6
-# define JB_PC	7
-# define JB_SIZE (8*8)
+# if defined __USE_MISC || defined _ASM
+#  define JB_RBX	0
+#  define JB_RBP	1
+#  define JB_R12	2
+#  define JB_R13	3
+#  define JB_R14	4
+#  define JB_R15	5
+#  define JB_RSP	6
+#  define JB_PC	7
+#  define JB_SIZE (8*8)
+# endif
+
+#else
+
+# if defined __USE_MISC || defined _ASM
+#  define JB_BX	0
+#  define JB_SI	1
+#  define JB_DI	2
+#  define JB_BP	3
+#  define JB_SP	4
+#  define JB_PC	5
+#  define JB_SIZE 24
+# endif
+
 #endif
 
 #ifndef _ASM
 
+# if __WORDSIZE == 64
 typedef long int __jmp_buf[8];
+# else
+typedef int __jmp_buf[6];
+# endif
 
 /* Test if longjmp to JMPBUF would unwind the frame
    containing a local variable at ADDRESS.  */
-#define _JMPBUF_UNWINDS(jmpbuf, address) \
+# if __WORDSIZE == 64
+#  define _JMPBUF_UNWINDS(jmpbuf, address) \
   ((void *) (address) < (void *) (jmpbuf)[JB_RSP])
+# else
+#  define _JMPBUF_UNWINDS(jmpbuf, address) \
+  ((void *) (address) < (void *) (jmpbuf)[JB_SP])
+# endif
 #endif
-- 
cgit v1.2.3