# HG changeset patch
# User Gary Benson <gbenson@redhat.com>
# Date 1231853452 18000
# Node ID fe32914531b8bd4b3b7276e19792572e1ef7c87a
# Parent  c672bd2ca9782c6dc1837a901347861e31dc96a9
2009-01-13  Gary Benson  <gbenson@redhat.com>

	* contrib/jck/compile-native-code.sh: Build with -m32 or -m64.

diff -r c672bd2ca978 -r fe32914531b8 ChangeLog
--- a/ChangeLog	Tue Jan 13 12:30:34 2009 +0100
+++ b/ChangeLog	Tue Jan 13 08:30:52 2009 -0500
@@ -1,3 +1,7 @@
+2009-01-13  Gary Benson  <gbenson@redhat.com>
+
+	* contrib/jck/compile-native-code.sh: Build with -m32 or -m64.
+
 2009-01-13  Matthias Klose  <doko@ubuntu.com>
 
 	* patches/hotspot/14.0b08/icedtea-hotspot-dispatch.patch: Remove,
diff -r c672bd2ca978 -r fe32914531b8 contrib/jck/compile-native-code.sh
--- a/contrib/jck/compile-native-code.sh	Tue Jan 13 12:30:34 2009 +0100
+++ b/contrib/jck/compile-native-code.sh	Tue Jan 13 08:30:52 2009 -0500
@@ -17,6 +17,19 @@
   exit 1
 fi
 
+arch=$(uname -m)
+case "$arch" in
+  i?86|ppc)
+    MFLAG=-m32
+    ;;
+  x86_64|ppc64)
+    MFLAG=-m64
+    ;;
+  *)
+    echo 1>&2 "error: unhandled arch '$arch'"
+    exit 1
+esac
+
 LIBDIR=$basedir/lib
 RESDIR=$basedir/resources
 
@@ -29,31 +42,31 @@
 cp -r $JCKDIR/tests/api/javax_management/loading/data/* $RESDIR
 chmod -R +w  $RESDIR
 
-gcc -fPIC -shared -o $LIBDIR/libjckatr.so -I$JCKDIR \
+gcc $MFLAG -fPIC -shared -o $LIBDIR/libjckatr.so -I$JCKDIR \
   $JCKDIR/src/share/lib/atr/jckatr.c   
 
-gcc -fPIC -shared -o $LIBDIR/libjckjni.so -I$JCKDIR \
+gcc $MFLAG -fPIC -shared -o $LIBDIR/libjckjni.so -I$JCKDIR \
   -I$JCKDIR/src/share/lib/jni/include \
   -I$JCKDIR/src/share/lib/jni/include/solaris \
   $JCKDIR/src/share/lib/jni/jckjni.c   
 
-gcc -fPIC -shared -o $LIBDIR/libjckjvmti.so -I$JCKDIR \
+gcc $MFLAG -fPIC -shared -o $LIBDIR/libjckjvmti.so -I$JCKDIR \
   -I$JCKDIR/src/share/lib/jvmti/include \
   -I$JCKDIR/src/share/lib/jni/include \
   -I$JCKDIR/src/share/lib/jni/include/solaris \
   $JCKDIR/src/share/lib/jvmti/jckjvmti.c   
 
-gcc -fPIC -shared -o $LIBDIR/libsystemInfo.so \
+gcc $MFLAG -fPIC -shared -o $LIBDIR/libsystemInfo.so \
   -I$JCKDIR/src/share/lib/jni/include \
   -I$JCKDIR/src/share/lib/jni/include/solaris \
   $JCKDIR/tests/api/javax_management/loading/data/archives/src/C/com_sun_management_mbeans_loading_SystemInfoUseNativeLib.c   
 
-gcc -fPIC -shared -o $LIBDIR/libjmxlibid.so \
+gcc $MFLAG -fPIC -shared -o $LIBDIR/libjmxlibid.so \
   -I$JCKDIR/src/share/lib/jni/include \
   -I$JCKDIR/src/share/lib/jni/include/solaris \
   $JCKDIR/tests/api/javax_management/loading/data/archives/src/C/com_sun_management_mbeans_loading_GetLibIdFromNativeLib.c   
 
-gcc -fPIC -shared -o $LIBDIR/libgenrandom.so \
+gcc $MFLAG -fPIC -shared -o $LIBDIR/libgenrandom.so \
   -I$JCKDIR/src/share/lib/jni/include \
   -I$JCKDIR/src/share/lib/jni/include/solaris \
   $JCKDIR/tests/api/javax_management/loading/data/archives/src/C/com_sun_management_mbeans_loading_RandomGen.c