Add jmp_buf-macros.h for ColdFire [committed]

Message ID alpine.DEB.2.20.1801242227060.24303@digraph.polyomino.org.uk
State Committed
Headers

Commit Message

Joseph Myers Jan. 24, 2018, 10:27 p.m. UTC
  This patch adds a jmp_buf-macros.h for ColdFire.  In conjunction with
a GCC patch to fix the libgcc build failure for ColdFire
<https://gcc.gnu.org/ml/gcc-patches/2018-01/msg02064.html> this
suffices to restore the build (tested with build-many-glibcs.py).  A
further patch will be needed for soft-float ColdFire (while the
function-calling ABI is the same for hard-float and soft-float
ColdFire, it turns out the glibc ABI is not - so another ColdFire
variant will be needed in build-many-glibcs.py), but I'll deal with
that separately.

Tested with build-many-glibcs.py (m68k-linux-gnu and
m68k-linux-gnu-coldfire).  (There's a localplt test failure for
coldfire; that's the only failure in the compilation part of the
testsuite.)  Committed.

2018-01-24  Joseph Myers  <joseph@codesourcery.com>

	* sysdeps/unix/sysv/linux/m68k/jmp_buf-macros.h: Move to ....
	* sysdeps/unix/sysv/linux/m68k/m680x0/jmp_buf-macros.h: ... here.
	* sysdeps/unix/sysv/linux/m68k/coldfire/jmp_buf-macros.h: New
	file.
  

Patch

diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/m68k/coldfire/jmp_buf-macros.h
new file mode 100644
index 0000000..9b25281
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/jmp_buf-macros.h
@@ -0,0 +1,6 @@ 
+#define JMP_BUF_SIZE 256
+#define SIGJMP_BUF_SIZE 256
+#define JMP_BUF_ALIGN 2
+#define SIGJMP_BUF_ALIGN 2
+#define MASK_WAS_SAVED_OFFSET 124
+#define SAVED_MASK_OFFSET 128
diff --git a/sysdeps/unix/sysv/linux/m68k/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/m68k/jmp_buf-macros.h
deleted file mode 100644
index 2f62ecb..0000000
--- a/sysdeps/unix/sysv/linux/m68k/jmp_buf-macros.h
+++ /dev/null
@@ -1,6 +0,0 @@ 
-#define JMP_BUF_SIZE 288
-#define SIGJMP_BUF_SIZE 288
-#define JMP_BUF_ALIGN 2
-#define SIGJMP_BUF_ALIGN 2
-#define MASK_WAS_SAVED_OFFSET 156
-#define SAVED_MASK_OFFSET 160
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/m68k/m680x0/jmp_buf-macros.h
new file mode 100644
index 0000000..2f62ecb
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/jmp_buf-macros.h
@@ -0,0 +1,6 @@ 
+#define JMP_BUF_SIZE 288
+#define SIGJMP_BUF_SIZE 288
+#define JMP_BUF_ALIGN 2
+#define SIGJMP_BUF_ALIGN 2
+#define MASK_WAS_SAVED_OFFSET 156
+#define SAVED_MASK_OFFSET 160