[commit] r2122 - use gcc instead of gas

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

[commit] r2122 - use gcc instead of gas

commits-3
 
Author: piumarta
Date: 2009-08-31 14:40:47 -0700 (Mon, 31 Aug 2009)
New Revision: 2122

Modified:
   trunk/platforms/unix/ChangeLog
   trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake
Log:
use gcc instead of gas

Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog 2009-08-31 21:25:22 UTC (rev 2121)
+++ trunk/platforms/unix/ChangeLog 2009-08-31 21:40:47 UTC (rev 2122)
@@ -1,5 +1,8 @@
 2009-08-31  Ian Piumarta  <com -dot- gmail -at- piumarta (backwards)>
 
+ * plugins/SqueakFFIPrims/config.cmake: Compile .S using gcc if
+ possible.
+
  * vm/sqUnixExternalPrims.c: Include limits.h instead of
  sys/param.h to get PATH_MAX.
 

Modified: trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-31 21:25:22 UTC (rev 2121)
+++ trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-31 21:40:47 UTC (rev 2122)
@@ -45,6 +45,10 @@
   ENDIF ()
   ENABLE_LANGUAGE (ASM)
   PLUGIN_SOURCES ("${SQFFIC} ${unix}/plugins/${plugin}/${cpu}-${abi}.c ${unix}/plugins/${plugin}/${cpu}-${abi}-asm.S")
+  IF (CMAKE_COMPILER_IS_GNUCC)
+    SET (CMAKE_ASM_COMPILER "${CMAKE_C_COMPILER}")
+    SET (CMAKE_ASM_COMPILER_ARG1 "-c")
+  ENDIF (CMAKE_COMPILER_IS_GNUCC)
 ENDIF ()
 
 CONFIG_DEFINE (HAVE_FFI_H)