From 89765719d8c1ce93dd5f07cd0f6b0a0071cdcb70 Mon Sep 17 00:00:00 2001
From: Peter Bex <address@hidden>
Date: Tue, 1 Sep 2015 20:31:13 +0200
Subject: [PATCH] Add support for the Linux X32 ABI.

This is simply a check on ARCH to add a flag to the C compiler and
the linker.

Thanks to Sven Hartrumpf for pointing out CHICKEN now supports this
since the argvector changes, and for testing.
---
 Makefile.linux | 7 +++++++
 NEWS           | 5 +++++
 README         | 3 +++
 3 files changed, 15 insertions(+)

diff --git a/Makefile.linux b/Makefile.linux
index 45ae3a2..4ec121c 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -50,6 +50,13 @@ LIBRARIES = -lm -ldl
 NEEDS_RELINKING = yes
 USES_SONAME = yes
 
+# architectures
+
+ifeq ($(ARCH),x32)
+C_COMPILER_OPTIONS += -mx32
+LINKER_OPTIONS += -mx32
+endif
+
 # special files
 
 CHICKEN_CONFIG_H = chicken-config.h
diff --git a/NEWS b/NEWS
index 79519da..65fbf75 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,11 @@
   - The core units have been converted to modules under the "chicken"
     namespace.
 
+4.10.2
+
+- Platform support
+  - CHICKEN now supports the Linux X32 ABI (thanks to Sven Hartrumpf).
+
 4.10.1
 
 - Runtime system:
diff --git a/README b/README
index 98191ad..c85c2ce 100644
--- a/README
+++ b/README
@@ -410,6 +410,9 @@
 
         Linux:
 
+	  - If you want to build Linux binaries which use the "X32 ABI",
+	    you can pass ARCH=x32 on the Make command line.
+
 	  - Some old Linux distributions ship with a buggy version of
 	    the GNU C compiler (2.96). If the system is configured for
 	    kernel recompilation, then an alternative GCC version is
-- 
2.1.4