Mercurial Mercurial > upstream > oracle > userland-gate / annotate
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5182
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
     1
 
# Fix for building on x86
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
     2
 
# This fix was already sent upstream and is in later versions
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
     3
 
--- libffi-3.0.9/src/x86/ffitarget.h.orig	2009-12-29 23:22:26.000000000 +0800
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
     4
 
+++ libffi-3.0.9/src/x86/ffitarget.h	2010-04-28 16:30:53.542909753 +0800
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
     5
 
@@ -31,7 +31,7 @@
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
     6
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
     7
 
 /* ---- System specific configurations ----------------------------------- */
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
     8
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
     9
 
-#if defined (X86_64) && defined (__i386__)
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    10
 
+#if defined (X86_64) && (defined (__i386__) || defined (__i386))
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    11
 
 #undef X86_64
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    12
 
 #define X86
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    13
 
 #endif
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    14
 
@@ -74,10 +74,10 @@
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    15
 
 #else
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    16
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    17
 
   /* ---- Intel x86 and AMD x86-64 - */
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    18
 
-#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    19
 
+#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__))
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    20
 
   FFI_SYSV,
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    21
 
   FFI_UNIX64,   /* Unix variants all use the same ABI for x86-64  */
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    22
 
-#ifdef __i386__
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    23
 
+#if defined(__i386__) || defined(__i386)
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    24
 
   FFI_DEFAULT_ABI = FFI_SYSV,
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    25
 
 #else
78cc8a5782fa 15820206 SUNBT7202646 Move libffi from Desktop consolidation to Userland
Bill Rushmore <bill.rushmore@oracle.com>
parents:
diff changeset 
    26
 
   FFI_DEFAULT_ABI = FFI_UNIX64,
upstream/oracle/userland-gate