[Vm-dev] [commit][3372] Fix a few discrepancies in the ARM build
scripts
commits at squeakvm.org
commits at squeakvm.org
Sat Jun 6 04:44:22 UTC 2015
Revision: 3372
Author: eliot
Date: 2015-06-05 21:44:20 -0700 (Fri, 05 Jun 2015)
Log Message:
-----------
Fix a few discrepancies in the ARM build scripts
Modified Paths:
--------------
branches/Cog/build.linux32ARM/squeak.cog.spur/build/mvm
branches/Cog/build.linux32ARM/squeak.cog.spur/build.assert/mvm
branches/Cog/build.linux32ARM/squeak.cog.spur/build.debug/mvm
branches/Cog/build.linux32ARM/squeak.stack.spur/build/mvm
branches/Cog/build.linux32ARM/squeak.stack.spur/build.assert/mvm
branches/Cog/build.linux32ARM/squeak.stack.spur/build.debug/mvm
branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm
branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm
branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm
Modified: branches/Cog/build.linux32ARM/squeak.cog.spur/build/mvm
===================================================================
--- branches/Cog/build.linux32ARM/squeak.cog.spur/build/mvm 2015-06-06 02:49:22 UTC (rev 3371)
+++ branches/Cog/build.linux32ARM/squeak.cog.spur/build/mvm 2015-06-06 04:44:20 UTC (rev 3372)
@@ -1,11 +1,7 @@
#!/bin/bash
# Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=cogspurlinuxhtARM
-# Some gcc versions create a broken VM using -O2
-case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
-3.4.*) OPT="-g -O1 -DNDEBUG -DDEBUGVM=0";;
-*) OPT="-g -O2 -DNDEBUG -DDEBUGVM=0";;
-esac
+OPT="-g -O2 -DNDEBUG -DDEBUGVM=0"
if [ $# -ge 1 ]; then
INSTALLDIR="$1"; shift
@@ -20,9 +16,9 @@
test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
--without-vm-display-fbdev --with-vmversion=5.0 \
--with-src=spursrc --with-plugins=src/plugins \
- CC="gcc " \
- CXX="g++ " \
- CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0" \
+ CC=gcc \
+ CXX=g++ \
+ CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0" \
LIBS="-lpthread -luuid -lasound" \
LDFLAGS=-Wl,-z,now
rm -f vm/sqUnixMain.o # nuke version info
Modified: branches/Cog/build.linux32ARM/squeak.cog.spur/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32ARM/squeak.cog.spur/build.assert/mvm 2015-06-06 02:49:22 UTC (rev 3371)
+++ branches/Cog/build.linux32ARM/squeak.cog.spur/build.assert/mvm 2015-06-06 04:44:20 UTC (rev 3372)
@@ -1,7 +1,7 @@
#!/bin/bash
# assert VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/cogspurlinuxhtARM
-OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
+OPT="-g3 -O1 -DDEBUGVM=0"
if [ $# -ge 1 ]; then
INSTALLDIR="$1"; shift
@@ -14,15 +14,15 @@
*) test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
- --with-vmversion=5.0 \
+ --without-vm-display-fbdev --with-vmversion=5.0 \
--with-src=spursrc --with-plugins=src/plugins \
- CC="gcc -m32" \
- CXX="g++ -m32" \
- CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0" \
- LIBS="-lpthread -luuid" \
+ CC=gcc \
+ CXX=g++ \
+ CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0" \
+ LIBS="-lpthread -luuid -lasound" \
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
-make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
+make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
Modified: branches/Cog/build.linux32ARM/squeak.cog.spur/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32ARM/squeak.cog.spur/build.debug/mvm 2015-06-06 02:49:22 UTC (rev 3371)
+++ branches/Cog/build.linux32ARM/squeak.cog.spur/build.debug/mvm 2015-06-06 04:44:20 UTC (rev 3372)
@@ -16,8 +16,8 @@
test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
--without-vm-display-fbdev --with-vmversion=5.0 \
--with-src=spursrc --with-plugins=src/plugins \
- CC="gcc " \
- CXX="g++ " \
+ CC=gcc \
+ CXX=g++ \
CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0" \
LIBS="-lpthread -luuid -lasound" \
LDFLAGS=-Wl,-z,now
Modified: branches/Cog/build.linux32ARM/squeak.stack.spur/build/mvm
===================================================================
--- branches/Cog/build.linux32ARM/squeak.stack.spur/build/mvm 2015-06-06 02:49:22 UTC (rev 3371)
+++ branches/Cog/build.linux32ARM/squeak.stack.spur/build/mvm 2015-06-06 04:44:20 UTC (rev 3372)
@@ -1,11 +1,7 @@
#!/bin/bash
# Stack Spur VM and threaded heartbeat
INSTALLDIR=stkspurlinuxhtARM
-# Some gcc versions create a broken VM using -O2
-case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
-3.4.*) OPT="-g -O1 -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1";;
-*) OPT="-g -O3 -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1";;
-esac
+OPT="-g -O3 -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1"
if [ $# -ge 1 ]; then
INSTALLDIR="$1"; shift
@@ -21,8 +17,8 @@
--with-vmversion=5.0 \
--with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
- CC="gcc " \
- CXX="g++ " \
+ CC=gcc \
+ CXX=g++ \
CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
@@ -30,4 +26,4 @@
rm -rf ../../../products/$INSTALLDIR
# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
Modified: branches/Cog/build.linux32ARM/squeak.stack.spur/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32ARM/squeak.stack.spur/build.assert/mvm 2015-06-06 02:49:22 UTC (rev 3371)
+++ branches/Cog/build.linux32ARM/squeak.stack.spur/build.assert/mvm 2015-06-06 04:44:20 UTC (rev 3372)
@@ -1,7 +1,7 @@
#!/bin/bash
# assert Stack Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/stkspurlinuxhtARM
-OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
+OPT="-g3 -O1 -DDEBUGVM=0"
if [ $# -ge 1 ]; then
INSTALLDIR="$1"; shift
@@ -17,8 +17,8 @@
--with-vmversion=5.0 \
--with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
- CC="gcc " \
- CXX="g++ " \
+ CC=gcc \
+ CXX=g++ \
CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
@@ -26,4 +26,4 @@
rm -rf ../../../products/$INSTALLDIR
# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
Modified: branches/Cog/build.linux32ARM/squeak.stack.spur/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32ARM/squeak.stack.spur/build.debug/mvm 2015-06-06 02:49:22 UTC (rev 3371)
+++ branches/Cog/build.linux32ARM/squeak.stack.spur/build.debug/mvm 2015-06-06 04:44:20 UTC (rev 3372)
@@ -17,8 +17,8 @@
--with-vmversion=5.0 \
--with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
- CC="gcc " \
- CXX="g++ " \
+ CC=gcc \
+ CXX=g++ \
CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
@@ -26,4 +26,4 @@
rm -rf ../../../products/$INSTALLDIR
# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm
===================================================================
--- branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm 2015-06-06 02:49:22 UTC (rev 3371)
+++ branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm 2015-06-06 04:44:20 UTC (rev 3372)
@@ -1,11 +1,7 @@
#!/bin/bash
# Stack VM with VM profiler and threaded heartbeat
INSTALLDIR=stklinuxhtARM
-# Some gcc versions create a broken VM using -O2
-case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
-3.4.*) OPT="-g -O1 -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1";;
-*) OPT="-g -O3 -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1";;
-esac
+OPT="-g -O3 -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1"
if [ $# -ge 1 ]; then
INSTALLDIR="$1"; shift
@@ -20,8 +16,8 @@
test -f config.h || ../../../platforms/unix/config/configure \
--with-src=stacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
- CC="gcc " \
- CXX="g++ " \
+ CC=gcc \
+ CXX=g++ \
CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \
LIBS="-lpthread -luuid -lasound" \
LDFLAGS=-Wl,-z,now
@@ -29,4 +25,4 @@
rm -rf ../../../products/$INSTALLDIR
# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make -j4 install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+make -j4 install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm 2015-06-06 02:49:22 UTC (rev 3371)
+++ branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm 2015-06-06 04:44:20 UTC (rev 3372)
@@ -1,7 +1,7 @@
#!/bin/bash
# assert Stack VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/stklinuxhtARM
-OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
+OPT="-g3 -O1 -DDEBUGVM=0"
if [ $# -ge 1 ]; then
INSTALLDIR="$1"; shift
@@ -16,8 +16,8 @@
test -f config.h || ../../../platforms/unix/config/configure \
--with-src=stacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
- CC="gcc " \
- CXX="g++ " \
+ CC=gcc \
+ CXX=g++ \
CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \
LIBS="-lpthread -luuid -lasound" \
LDFLAGS=-Wl,-z,now
@@ -25,4 +25,4 @@
rm -rf ../../../products/$INSTALLDIR
# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
-make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm 2015-06-06 02:49:22 UTC (rev 3371)
+++ branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm 2015-06-06 04:44:20 UTC (rev 3372)
@@ -16,8 +16,8 @@
test -f config.h || ../../../platforms/unix/config/configure \
--with-src=stacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
- CC="gcc " \
- CXX="g++ " \
+ CC=gcc \
+ CXX=g++ \
CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \
LIBS="-lpthread -luuid -lasound" \
LDFLAGS=-Wl,-z,now
More information about the Vm-dev
mailing list