[commit][3575] Make sure that the various IA32ABI support filers compile only on their intended ISAs .

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[commit][3575] Make sure that the various IA32ABI support filers compile only on their intended ISAs .

commits-3
 
Revision: 3575
Author:   eliot
Date:     2016-02-10 09:36:18 -0800 (Wed, 10 Feb 2016)
Log Message:
-----------
Make sure that the various IA32ABI support filers compile only on their intended ISAs.  Fix some speeling rores.

Modified Paths:
--------------
    trunk/platforms/Cross/plugins/IA32ABI/arm32ia32abicc.c
    trunk/platforms/Cross/plugins/IA32ABI/ia32abicc.c
    trunk/platforms/Cross/plugins/IA32ABI/ppc32abicc.c
    trunk/platforms/Cross/plugins/IA32ABI/x64ia32abicc.c
    trunk/platforms/Cross/plugins/IA32ABI/xabicc.c

Property Changed:
----------------
    trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h

Modified: trunk/platforms/Cross/plugins/IA32ABI/arm32ia32abicc.c
===================================================================
--- trunk/platforms/Cross/plugins/IA32ABI/arm32ia32abicc.c 2016-01-29 23:34:16 UTC (rev 3574)
+++ trunk/platforms/Cross/plugins/IA32ABI/arm32ia32abicc.c 2016-02-10 17:36:18 UTC (rev 3575)
@@ -5,6 +5,11 @@
  *  Written by Eliot Miranda & Ryan Macnak, 07/15.
  */
 
+/* null if compiled on other than arm32, to get around gnu make bugs or
+ * misunderstandings on our part.
+ */
+#if defined(__ARM_ARCH__) || defined(__arm__) || defined(__arm32__) || defined(ARM32)
+
 #include <stdlib.h> /* for valloc */
 #include <sys/mman.h> /* for mprotect */
 
@@ -269,3 +274,4 @@
 #endif
  return mem;
 }
+#endif /* defined(__ARM_ARCH__) || defined(__arm__) || ... */

Modified: trunk/platforms/Cross/plugins/IA32ABI/ia32abicc.c
===================================================================
--- trunk/platforms/Cross/plugins/IA32ABI/ia32abicc.c 2016-01-29 23:34:16 UTC (rev 3574)
+++ trunk/platforms/Cross/plugins/IA32ABI/ia32abicc.c 2016-02-10 17:36:18 UTC (rev 3575)
@@ -5,6 +5,11 @@
  *  Written by Eliot Miranda 11/07.
  */
 
+/* null if compiled on other than x86, to get around gnu make bugs or
+ * misunderstandings on our part.
+ */
+#if i386|i486|i586|i686
+
 #if defined(_MSC_VER) || defined(__MINGW32__)
 # include "windows.h" /* for GetSystemInfo & VirtualAlloc */
 #elif __APPLE__ && __MACH__
@@ -299,3 +304,4 @@
 #endif
  return mem;
 }
+#endif /* i386|i486|i586|i686 */

Modified: trunk/platforms/Cross/plugins/IA32ABI/ppc32abicc.c
===================================================================
--- trunk/platforms/Cross/plugins/IA32ABI/ppc32abicc.c 2016-01-29 23:34:16 UTC (rev 3574)
+++ trunk/platforms/Cross/plugins/IA32ABI/ppc32abicc.c 2016-02-10 17:36:18 UTC (rev 3575)
@@ -1,3 +1,6 @@
+/* null if compiled on other than x64, to get around gnu make bugs or
+ * misunderstandings on our part.
+ */
 #if defined(__powerpc__) || defined(PPC) || defined(_POWER) || defined(_IBMR2) || defined(__ppc__)
 /*
  * Some of this code is
@@ -36,7 +39,7 @@
 /*
  *  ppc32abicc.c
  *
- * Support for Call-outs and Call-backs from the Plugin.
+ * Support for Call-outs and Call-backs from the Alien Plugin.
  *
  */
 
@@ -321,4 +324,4 @@
 #endif
  return mem;
 }
-#endif
+#endif /* defined(__powerpc__) || defined(PPC) ... */

Modified: trunk/platforms/Cross/plugins/IA32ABI/x64ia32abicc.c
===================================================================
--- trunk/platforms/Cross/plugins/IA32ABI/x64ia32abicc.c 2016-01-29 23:34:16 UTC (rev 3574)
+++ trunk/platforms/Cross/plugins/IA32ABI/x64ia32abicc.c 2016-02-10 17:36:18 UTC (rev 3575)
@@ -11,6 +11,11 @@
  * here referred to as x64ABI
  */
 
+/* null if compiled on other than x64, to get around gnu make bugs or
+ * misunderstandings on our part.
+ */
+#if x86_64|x64|__x86_64|__x86_64__
+
 #if defined(_MSC_VER) || defined(__MINGW32__)
 # include "windows.h" /* for GetSystemInfo & VirtualAlloc */
 # error Windows doesn't use the SystemV ABI
@@ -302,3 +307,4 @@
 #endif
  return mem;
 }
+#endif /* x86_64|x64|__x86_64|__x86_64__ */

Modified: trunk/platforms/Cross/plugins/IA32ABI/xabicc.c
===================================================================
--- trunk/platforms/Cross/plugins/IA32ABI/xabicc.c 2016-01-29 23:34:16 UTC (rev 3574)
+++ trunk/platforms/Cross/plugins/IA32ABI/xabicc.c 2016-02-10 17:36:18 UTC (rev 3575)
@@ -1,5 +1,5 @@
 /*
- *  xabicc.c - platform-agnostic root for ALien call-outs and callbacks.
+ *  xabicc.c - platform-agnostic root for Alien call-outs and callbacks.
  *
  * Support for Call-outs and Call-backs from the IA32ABI Plugin.
  * The plugin is misnamed.  It should be the AlienPlugin, but its history


Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Wed Dec 16 16:51:42 PST 2015
   + Wed Feb 10 09:35:01 PST 2016