[MLton-commit] r7027

[Ville Laurikari]

Build 64-bit binaries on AIX.

----------------------------------------------------------------------

U   mlton/trunk/bin/add-cross
U   mlton/trunk/bin/mlton-script
U   mlton/trunk/runtime/Makefile

----------------------------------------------------------------------

Modified: mlton/trunk/bin/add-cross
===================================================================
--- mlton/trunk/bin/add-cross	2009-03-06 09:15:03 UTC (rev 7026)
+++ mlton/trunk/bin/add-cross	2009-03-06 09:15:07 UTC (rev 7027)
@@ -123,7 +123,7 @@
 
 case "$crossOS" in
 aix)
-        osOpts=''
+        osOpts='-maix64'
 ;;
 cygwin)
         osOpts=''

Modified: mlton/trunk/bin/mlton-script
===================================================================
--- mlton/trunk/bin/mlton-script	2009-03-06 09:15:03 UTC (rev 7026)
+++ mlton/trunk/bin/mlton-script	2009-03-06 09:15:07 UTC (rev 7027)
@@ -98,6 +98,7 @@
         -target-cc-opt freebsd '-I/usr/local/include'            \
         -target-cc-opt netbsd '-I/usr/pkg/include'               \
         -target-cc-opt openbsd '-I/usr/local/include'            \
+        -target-cc-opt aix '-maix64'                             \
         -target-cc-opt ia64 '-mlp64 -mtune=itanium2'             \
         -target-cc-opt sparc '-m32 -mcpu=v8 -Wa,-xarch=v8plusa'  \
         -target-cc-opt x86                                       \
@@ -111,6 +112,7 @@
         -target-link-opt amd64 '-m64'                            \
         -target-link-opt darwin "$darwinLinkOpts"                \
         -target-link-opt freebsd '-L/usr/local/lib/'             \
+        -target-link-opt aix '-maix64'                           \
         -target-link-opt ia64 '-mlp64'                           \
         -target-link-opt mingw                                   \
                 '-lws2_32 -lkernel32 -lpsapi -lnetapi32 -lwinmm' \

Modified: mlton/trunk/runtime/Makefile
===================================================================
--- mlton/trunk/runtime/Makefile	2009-03-06 09:15:03 UTC (rev 7026)
+++ mlton/trunk/runtime/Makefile	2009-03-06 09:15:07 UTC (rev 7027)
@@ -78,6 +78,11 @@
 FLAGS += -mlp64 -mtune=itanium2
 endif
 
+ifeq ($(TARGET_OS)-$(TARGET_ARCH), aix-powerpc)
+FLAGS += -maix64
+AR := ar -X 64 rc
+endif
+
 ifeq ($(TARGET_ARCH), sparc)
 FLAGS += -m32 -mcpu=v8 -Wa,-xarch=v8plusa
 endif