X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2Fgmp%2Fconfigure.in;h=18f610fe298eb5da95ae2d200eddb8e57b01557e;hb=a20ec0ced36bca7cd0594528922dbe31a6186eae;hp=e13e0cb6333a637d6529dc8c38cab8893773a6b7;hpb=02086d37deb490c36065f5bad97745a7fcb164bf;p=ghc-hetmet.git

diff --git a/ghc/rts/gmp/configure.in b/ghc/rts/gmp/configure.in
index e13e0cb..18f610f 100644
--- a/ghc/rts/gmp/configure.in
+++ b/ghc/rts/gmp/configure.in
@@ -21,7 +21,7 @@ dnl  the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 dnl  MA 02111-1307, USA.
 
 
-AC_REVISION($Revision: 1.6 $)dnl
+AC_REVISION($Revision: 1.8 $)dnl
 AC_PREREQ(2.14)dnl
 AC_INIT(gmp-impl.h)
 
@@ -195,6 +195,9 @@ case "$target" in
     gmp_cflags64_cc="-xtarget=native -xarch=v9 -xO4"
     ;;
   sparc64-*-linux*)
+    # Need to think more about the options passed here.  This isn't good for
+    # some sparc64 linux distros, since we end up not optimizing when all the
+    # options below fail.
     os_64bit=yes
     gmp_cflags64_gcc="$gmp_cflags64_gcc -m64 -mptr64 -Wa,-xarch=v9 -mcpu=v9"
     gmp_cflags_gcc="$gmp_cflags_gcc -m32"
@@ -255,6 +258,9 @@ case "$target" in
     gmp_cflags_gcc="$gmp_cflags_gcc -mpowerpc64"
     AC_DEFINE(_LONG_LONG_LIMB)	dnl FIXME: Remove.
     ;;
+  powerpc-apple-darwin* | powerpc-apple-macosx*)
+    gmp_cflags_gcc="$gmp_cflags_gcc -mpowerpc -traditional-cpp"
+    ;;
   powerpc*-*-*)
     gmp_cflags_gcc="$gmp_cflags_gcc -mpowerpc"
     ;;
@@ -439,14 +445,16 @@ case ${target} in
     path="arm"
     ;;
   [sparcv9*-*-solaris2.[789]* | sparc64*-*-solaris2.[789]* | ultrasparc*-*-solaris2.[789]*])
-    if test -n "$CC64"; then
-      path="sparc64"
-    else
-      path="sparc32/v9 sparc32/v8 sparc32"
+    if test -n "$CC64"
+      then path="sparc64"
+      else path="sparc32/v9 sparc32/v8 sparc32"
     fi
     ;;
   sparc64-*-linux*)
-    path="sparc64"
+    if test -n "$CC64"
+      then path="sparc64"
+      else path="sparc32/v9 sparc32/v8 sparc32"
+    fi
     ;;
   sparcv8*-*-* | microsparc*-*-*)
 	path="sparc32/v8 sparc32"
@@ -779,7 +787,7 @@ case "$target" in
     ;;
   power*-*-*)
     case "$target" in
-      *-*-mach* | *-*-rhapsody* | *-*-nextstep*)
+      *-*-mach* | *-*-rhapsody* | *-*-nextstep* | *-*-darwin* | *-*-macosx*)
         ;;	# these use non-conventional assembly syntax.
       powerpc64-*-aix*)
 	gmp_m4postinc="powerpc32/regmap.m4 powerpc64/aix.m4"
@@ -877,7 +885,7 @@ for tmp_fn in ${gmp_mpn_functions} ; do
           # that multi-function files get grepped here repeatedly
           gmp_ep=["`
             sed -n 's/^[ 	]*MULFUNC_PROLOGUE(\(.*\))/\1/p' $tmp_file ;
-            sed -n 's/^[ 	]*PROLOGUE(\(.*\))/\1/p' $tmp_file
+            sed -n 's/^[ 	]*PROLOGUE.*(\(.*\))/\1/p' $tmp_file
           `"]
           for gmp_tmp in $gmp_ep; do
             AC_DEFINE_UNQUOTED(HAVE_NATIVE_${gmp_tmp})