SF.net SVN: jikesrvm:[15779] rvmroot/trunk

[dgrove-oss]

Revision: 15779
          http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15779&view=rev
Author:   dgrove-oss
Date:     2009-09-09 16:10:08 +0000 (Wed, 09 Sep 2009)

Log Message:
-----------
RVM-856 : Support for building under OS X 10.6.  Patch thanks to Laurence Hellyer.

Modified Paths:
--------------
    rvmroot/trunk/build/hosts/ia32-osx.properties
    rvmroot/trunk/tools/bootImageRunner/RunBootImage.C

Modified: rvmroot/trunk/build/hosts/ia32-osx.properties
===================================================================
--- rvmroot/trunk/build/hosts/ia32-osx.properties 2009-09-09 16:06:52 UTC (rev 15778)
+++ rvmroot/trunk/build/hosts/ia32-osx.properties 2009-09-09 16:10:08 UTC (rev 15779)
@@ -12,7 +12,7 @@
 #
 bison.exe=/usr/bin/bison
 c++.exe=/usr/bin/g++
-c++.args=-fno-common -mstackrealign
+c++.args=-fno-common -mstackrealign -m32
 c.exe=/usr/bin/gcc
 c.args=${c++.args} -O
 shld.args=${c++.args} -dynamiclib

Modified: rvmroot/trunk/tools/bootImageRunner/RunBootImage.C
===================================================================
--- rvmroot/trunk/tools/bootImageRunner/RunBootImage.C 2009-09-09 16:06:52 UTC (rev 15778)
+++ rvmroot/trunk/tools/bootImageRunner/RunBootImage.C 2009-09-09 16:10:08 UTC (rev 15779)
@@ -42,9 +42,12 @@
 #include <strings.h> /* bzero */
 #include <libgen.h>  /* basename */
 #include <sys/utsname.h>        // for uname(2)
-#if (defined __linux__) || (defined __MACH__) || (defined (__SVR4) && defined (__sun))
+#if (defined __linux__) || (defined (__SVR4) && defined (__sun))
 #include <ucontext.h>
 #include <signal.h>
+#elif (defined __MACH__)
+#include <sys/ucontext.h>
+#include <signal.h>
 #else
 #include <sys/cache.h>
 #include <sys/context.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits