This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
libffi multilib support
- From: Bo Thorsen <bo at suse dot de>
- To: <gcc-patches at gcc dot gnu dot org>
- Date: Fri, 27 Sep 2002 14:40:56 +0200 (CEST)
- Subject: libffi multilib support
Hi,
Multilib support on x86-64 mainline isn't working. This patch fixes
compilation and gets the first couple of tests running.
Can I commit it?
Index: include/ffi.h.in
===================================================================
RCS file: /cvs/gcc/gcc/libffi/include/ffi.h.in,v
retrieving revision 1.17
diff -u -r1.17 ffi.h.in
--- include/ffi.h.in 19 Jul 2002 01:08:42 -0000 1.17
+++ include/ffi.h.in 27 Sep 2002 12:36:36 -0000
@@ -189,23 +189,23 @@
#endif
#endif
+ /* ---- Intel x86 Win32 ---------- */
+#ifdef X86_WIN32
+ FFI_SYSV,
+ FFI_DEFAULT_ABI = FFI_SYSV,
+#endif
+
/* ---- Intel x86 and AMD x86-64 - */
-#if defined(X86) || defined(X86_64)
+#if defined(__i386__) || defined(__x86_64__)
FFI_SYSV,
FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */
-#ifdef X86
+#ifdef __i386__
FFI_DEFAULT_ABI = FFI_SYSV,
#else
FFI_DEFAULT_ABI = FFI_UNIX64,
#endif
#endif
- /* ---- Intel x86 Win32 ---------- */
-#ifdef X86_WIN32
- FFI_SYSV,
- FFI_DEFAULT_ABI = FFI_SYSV,
-#endif
-
/* ---- Intel ia64 ---------------- */
#ifdef IA64
FFI_UNIX, /* Linux and all Unix variants use the same conventions */
@@ -390,13 +390,7 @@
/* ---- Definitions for closures ----------------------------------------- */
-#ifdef X86
-
-#define FFI_CLOSURES 1 /* x86 supports closures */
-#define FFI_TRAMPOLINE_SIZE 10
-#define FFI_NATIVE_RAW_API 1 /* and has native raw api support */
-
-#elif defined(X86_WIN32)
+#ifdef __i386__
#define FFI_CLOSURES 1 /* x86 supports closures */
#define FFI_TRAMPOLINE_SIZE 10
--
Bo Thorsen | Praestevejen 4
Free software developer | 5290 Marslev
SuSE Labs | Denmark