Mercurial Mercurial > upstream > oracle > spec-files / 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.
patches/libffi-01-__i386__.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 17946 317acdff9b94
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17946
317acdff9b94 2010-04-29 Ginn Chen <[email protected]>
ginnchen
parents: 13290
diff changeset 
     1
 
--- libffi-3.0.9/src/x86/ffitarget.h.orig	2009-12-29 23:22:26.000000000 +0800
317acdff9b94 2010-04-29 Ginn Chen <[email protected]>
ginnchen
parents: 13290
diff changeset 
     2
 
+++ libffi-3.0.9/src/x86/ffitarget.h	2010-04-28 16:30:53.542909753 +0800
13290
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     3
 
@@ -31,7 +31,7 @@
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     4
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     5
 
 /* ---- System specific configurations ----------------------------------- */
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     6
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     7
 
-#if defined (X86_64) && defined (__i386__)
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     8
 
+#if defined (X86_64) && (defined (__i386__) || defined (__i386))
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
     9
 
 #undef X86_64
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    10
 
 #define X86
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    11
 
 #endif
17946
317acdff9b94 2010-04-29 Ginn Chen <[email protected]>
ginnchen
parents: 13290
diff changeset 
    12
 
@@ -74,10 +74,10 @@
317acdff9b94 2010-04-29 Ginn Chen <[email protected]>
ginnchen
parents: 13290
diff changeset 
    13
 
 #else
13290
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    14
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    15
 
   /* ---- Intel x86 and AMD x86-64 - */
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    16
 
-#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
17946
317acdff9b94 2010-04-29 Ginn Chen <[email protected]>
ginnchen
parents: 13290
diff changeset 
    17
 
+#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__))
13290
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    18
 
   FFI_SYSV,
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    19
 
   FFI_UNIX64,   /* Unix variants all use the same ABI for x86-64  */
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    20
 
-#ifdef __i386__
17946
317acdff9b94 2010-04-29 Ginn Chen <[email protected]>
ginnchen
parents: 13290
diff changeset 
    21
 
+#if defined(__i386__) || defined(__i386)
13290
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    22
 
   FFI_DEFAULT_ABI = FFI_SYSV,
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    23
 
 #else
93b9e959e744 2008-08-27 Laszlo (Laca) Peter <[email protected]>
laca
parents:
diff changeset 
    24
 
   FFI_DEFAULT_ABI = FFI_UNIX64,
upstream/oracle/spec-files