Mercurial Mercurial > upstream > oracle > userland-gate / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/libffi/patches/libffi-01-__i386__.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 02 Feb 2016 12:18:19 -0800
changeset 5385 ada5863c16fd
parent 5182 78cc8a5782fa
permissions -rw-r--r--
22649522 Popplet should be Poppler in its package manifest file.

# Fix for building on x86
# This fix was already sent upstream and is in later versions
--- libffi-3.0.9/src/x86/ffitarget.h.orig	2009-12-29 23:22:26.000000000 +0800
+++ libffi-3.0.9/src/x86/ffitarget.h	2010-04-28 16:30:53.542909753 +0800
@@ -31,7 +31,7 @@
 
 /* ---- System specific configurations ----------------------------------- */
 
-#if defined (X86_64) && defined (__i386__)
+#if defined (X86_64) && (defined (__i386__) || defined (__i386))
 #undef X86_64
 #define X86
 #endif
@@ -74,10 +74,10 @@
 #else
 
   /* ---- Intel x86 and AMD x86-64 - */
-#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
+#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__))
   FFI_SYSV,
   FFI_UNIX64,   /* Unix variants all use the same ABI for x86-64  */
-#ifdef __i386__
+#if defined(__i386__) || defined(__i386)
   FFI_DEFAULT_ABI = FFI_SYSV,
 #else
   FFI_DEFAULT_ABI = FFI_UNIX64,
upstream/oracle/userland-gate