[Vm-dev] [commit][3088] update ARM mvm etc files to include cleaner fastblt building

commits at squeakvm.org commits at squeakvm.org
Fri Oct 3 00:04:56 UTC 2014


Revision: 3088
Author:   rowledge
Date:     2014-10-02 17:04:54 -0700 (Thu, 02 Oct 2014)
Log Message:
-----------
update ARM mvm etc files to include cleaner fastblt building

Modified Paths:
--------------
    branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm
    branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm
    branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.ext
    branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.int
    branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm
    branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.ext
    branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.int

Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm
===================================================================
--- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm	2014-09-30 23:39:10 UTC (rev 3087)
+++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm	2014-10-03 00:04:54 UTC (rev 3088)
@@ -22,7 +22,7 @@
 	--without-vm-display-fbdev --without-npsqueak \
 	CC="gcc " \
 	CXX="g++ " \
-	CFLAGS="$OPT  -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64  -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \
+	CFLAGS="$OPT  -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64  -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \
 	LIBS="-lpthread -luuid" \
 	LDFLAGS=-Wl,-z,now
 rm -f vm/sqUnixMain.o # nuke version info

Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm	2014-09-30 23:39:10 UTC (rev 3087)
+++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm	2014-10-03 00:04:54 UTC (rev 3088)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # assert Stack VM with VM profiler and threaded heartbeat
-INSTALLDIR=assert/stklinuxht
+INSTALLDIR=assert/stklinuxhtARM
 OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
 
 if [ $# -ge 1 ]; then
@@ -16,13 +16,13 @@
 test -f config.h || ../../../platforms/unix/config/configure \
 	--with-src=stacksrc --with-plugins=src/plugins --disable-cogit \
 	--without-vm-display-fbdev --without-npsqueak \
-	CC="gcc -m32" \
-	CXX="g++ -m32" \
-	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \
+	CC="gcc " \
+	CXX="g++ " \
+	CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \
 	LIBS="-lpthread -luuid" \
 	LDFLAGS=-Wl,-z,now
 rm -f vm/sqUnixMain.o # nuke version info
 rm -rf ../../../products/$INSTALLDIR
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag
+# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG

Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.ext
===================================================================
--- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.ext	2014-09-30 23:39:10 UTC (rev 3087)
+++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.ext	2014-10-03 00:04:54 UTC (rev 3088)
@@ -1,8 +1,5 @@
 # Copied, perhaps edited, from ../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
-B3DAcceleratorPlugin \
-SqueakFFIPrims \
-SqueakSSL \
 LocalePlugin \
 UnixOSProcessPlugin \
 UUIDPlugin \

Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.int
===================================================================
--- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.int	2014-09-30 23:39:10 UTC (rev 3087)
+++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.int	2014-10-03 00:04:54 UTC (rev 3088)
@@ -15,7 +15,6 @@
 FilePlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
-IA32ABI \
 JoystickTabletPlugin \
 JPEGReaderPlugin \
 JPEGReadWriter2Plugin \

Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm	2014-09-30 23:39:10 UTC (rev 3087)
+++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm	2014-10-03 00:04:54 UTC (rev 3088)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # debug Stack VM with VM profiler and threaded heartbeat
-INSTALLDIR=debug/stklinuxht
+INSTALLDIR=debug/stklinuxhtARM
 OPT="-g3 -O0 -DDEBUGVM=1"
 
 if [ $# -ge 1 ]; then
@@ -15,14 +15,14 @@
 esac
 test -f config.h || ../../../platforms/unix/config/configure \
 	--with-src=stacksrc --with-plugins=src/plugins --disable-cogit \
-	--without-vm-display-fbdev --without-npsqueak \
-	CC="gcc -m32" \
-	CXX="g++ -m32" \
-	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \
+	--without-vm-display-fbdev --without-npsqueak\
+	CC="gcc " \
+	CXX="g++ " \
+	CFLAGS="$OPT  -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \
 	LIBS="-lpthread -luuid" \
 	LDFLAGS=-Wl,-z,now
 rm -f vm/sqUnixMain.o # nuke version info
 rm -rf ../../../products/$INSTALLDIR
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag
+# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
 make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG

Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.ext
===================================================================
--- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.ext	2014-09-30 23:39:10 UTC (rev 3087)
+++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.ext	2014-10-03 00:04:54 UTC (rev 3088)
@@ -1,9 +1,7 @@
 # Copied, perhaps edited, from ../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
-B3DAcceleratorPlugin \
-SqueakFFIPrims \
-SqueakSSL \
 LocalePlugin \
 UnixOSProcessPlugin \
 UUIDPlugin \
+UnicodePlugin \
 XDisplayControlPlugin

Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.int
===================================================================
--- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.int	2014-09-30 23:39:10 UTC (rev 3087)
+++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.int	2014-10-03 00:04:54 UTC (rev 3088)
@@ -15,7 +15,6 @@
 FilePlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
-IA32ABI \
 JoystickTabletPlugin \
 JPEGReaderPlugin \
 JPEGReadWriter2Plugin \



More information about the Vm-dev mailing list