OpenBSD build*/mvm breakout

building/linux64ARMv8/squeak.cog.spur/build.assert/mvm

@@ -6,24 +6,19 @@ INSTALLDIR=assert/sqcogspur64ARMv8linuxht
 MACHINE="-march=armv8-a -mtune=cortex-a72"
 OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
 
-if [ `uname` = "OpenBSD" ]; then
-    DUALMAP="-DDUAL_MAPPED_CODE_ZONE=0"
 # librt and libpthread functions now supplied by libc.
-# Many Linux systems supply empty library files but
-# OpenBSD does not.
-    LIBRT=""
-# OpenBSD has problems with fast-bitblt under gcc and clang
-    FASTBITBLT=""
+# Many Linux systems supply empty library files.
+LIBRT="-lrt"
+
 # Prefer clang over gcc if available
     if [ -n "$(command -v clang || true)" ]; then CC=clang; else CC=gcc; fi
-else # non-OpenBSD Linux
-    DUALMAP="-DDUAL_MAPPED_CODE_ZONE=1"
-    LIBRT="-lrt"
+
+DUALMAP="-DDUAL_MAPPED_CODE_ZONE=1"
 # Linux on ARMv8 properly compiles fast-bitblt under gcc
 # but compiles-and-segfaults with clang. Use gcc for now.
-	FASTBITBLT=" --enable-fast-bitblt "
-	CC=gcc
-fi
+FASTBITBLT=" --enable-fast-bitblt "
+CC=gcc
+
 
 if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift

building/linux64ARMv8/squeak.cog.spur/build.debug/mvm

@@ -6,24 +6,15 @@ INSTALLDIR=debug/sqcogspur64ARMv8linuxht
 MACHINE="-march=armv8-a -mtune=cortex-a72"
 OPT="-g3 -O0 -DDEBUGVM=1 -DAIO_DEBUG=1"
 
-if [ `uname` = "OpenBSD" ]; then
-    DUALMAP="-DDUAL_MAPPED_CODE_ZONE=0"
-# librt and libpthread functions now supplied by libc.
-# Many Linux systems supply empty library files but
-# OpenBSD does not.
-    LIBRT=""
-# OpenBSD has problems with fast-bitblt under gcc and clang
-    FASTBITBLT=""
 # Prefer clang over gcc if available
     if [ -n "$(command -v clang || true)" ]; then CC=clang; else CC=gcc; fi
-else # non-OpenBSD Linux
-    DUALMAP="-DDUAL_MAPPED_CODE_ZONE=1"
-    LIBRT="-lrt"
+
+DUALMAP="-DDUAL_MAPPED_CODE_ZONE=1"
+LIBRT="-lrt"
 # Linux on ARMv8 properly compiles fast-bitblt under gcc
 # but compiles-and-segfaults with clang. Use gcc for now.
-	FASTBITBLT=" --enable-fast-bitblt "
-	CC=gcc
-fi
+FASTBITBLT=" --enable-fast-bitblt "
+CC=gcc
 
 if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift

building/linux64ARMv8/squeak.cog.spur/build/mvm

@@ -6,30 +6,15 @@ INSTALLDIR=sqcogspur64ARMv8linuxht
 # tpr - add enablementisation of fast bitblt ben avison code
 MACHINE="-march=armv8-a -mtune=cortex-a72"
 OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -D_GNU_SOURCE -DUSEEVDEV"
-##OPT="-g -O3  -DMUSL -DNDEBUG -DDEBUGVM=0"
 
-if [ `uname` = "OpenBSD" ]; then
-    OPT="$OPT -DMUSL"
-    CFLAGS="$CFLAGS $OPT -I/usr/local/include"
-    LIBS="$LIBS -lexecinfo"
-    LDFLAGS="$LDFLAGS -L/usr/local/lib"
-    DUALMAP="-DDUAL_MAPPED_CODE_ZONE=0"
+DUALMAP="-DDUAL_MAPPED_CODE_ZONE=1"
 # librt and libpthread functions now supplied by libc.
-# Many Linux systems supply empty library files but
-# OpenBSD does not.
-    LIBRT=""
-# OpenBSD has problems with fast-bitblt under gcc and clang
-    FASTBITBLT=""
-# Prefer clang over gcc if available
-    if [ -n "$(command -v clang || true)" ]; then CC=clang; else CC=gcc; fi
-else # non-OpenBSD Linux
-    DUALMAP="-DDUAL_MAPPED_CODE_ZONE=1"
-    LIBRT="-lrt"
+# Many Linux systems supply empty library file.
+LIBRT="-lrt"
 # Linux on ARMv8 properly compiles fast-bitblt under gcc
 # but compiles-and-segfaults with clang. Use gcc for now.
-	FASTBITBLT=" --enable-fast-bitblt "
-	CC=gcc
-fi
+FASTBITBLT=" --enable-fast-bitblt "
+CC=gcc
 
 if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift

building/linux64ARMv8/squeak.cogmt.spur/build/mvm

@@ -4,8 +4,14 @@ set -e
 INSTALLDIR=sqcogspurmt64ARMv8linuxht
 # armv8.N-a all fail in signalSemaphoreWithIndex for N in 1,2,3,4,5
 MACHINE="-march=armv8-a -mtune=cortex-a72"
-OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV"
-##OPT="-g -O3 -DNDEBUG -DDEBUGVM=0"
+OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -DUSEEVDEV"
+CFLAGS="$CFLAGS $OPT -I/usr/local/include"
+LIBS="$LIBS -lexecinfo"
+LDFLAGS="$LDFLAGS -L/usr/local/lib"
+DUALMAP="-DDUAL_MAPPED_CODE_ZONE=0"
+# librt and libpthread functions now supplied by libc.
+# Many Linux systems supply empty library files.
+LIBRT="-lrt"
 
 if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift
@@ -23,9 +29,9 @@ test -f config.h || ../../../../platforms/unix/config/configure \
 	--without-npsqueak \
 	--with-scriptname=spur64 \
 	INTERP=cointerpmt \
-	CC=clang \
+	CC=gcc \
 	CFLAGS="$MACHINE $OPT -DCOGMTVM=1 -DDUAL_MAPPED_CODE_ZONE=1" \
-	LIBS="-lrt"
+	LIBS=$LIBRT
 ##	--without-vm-display-fbdev --without-npsqueak \
 rm -f vm/sqUnixMain.o # nuke version info
 rm -rf ../../../../products/$INSTALLDIR

building/linux64ARMv8/squeak.stack.spur/build.assert/mvm

@@ -4,11 +4,7 @@ set -e
 INSTALLDIR=assert/sqstkspur64ARMv8linuxht
 OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
 
-if [ `uname` = "OpenBSD" ]; then
-    DUALMAP="-DDUAL_MAPPED_CODE_ZONE=0"
-else
-    DUALMAP="-DDUAL_MAPPED_CODE_ZONE=1"
-fi
+DUALMAP="-DDUAL_MAPPED_CODE_ZONE=1"
 
 # Prefer clang over gcc if available
 if [ -n "$(command -v clang || true)" ]; then CC=clang; else CC=gcc; fi

building/linux64ARMv8/squeak.stack.spur/build.debug/mvm

@@ -4,13 +4,7 @@ set -e
 INSTALLDIR=debug/sqstkspur64ARMv8linuxht
 OPT="-g3 -O0 -DDEBUG -DDEBUGVM=1 -DDEBUG_EVENTS -DDEBUG_KEYBOARD_EVENTS -DDEBUG_MOUSE_EVENTS -DUSEEVDEV -DMUSL"
 
-### OPT="-g3 -O0 -DDEBUGVM=1"
-
-if [ `uname` = "OpenBSD" ]; then
-    DUALMAP="-DDUAL_MAPPED_CODE_ZONE=0"
-else
-    DUALMAP="-DDUAL_MAPPED_CODE_ZONE=1"
-fi
+DUALMAP="-DDUAL_MAPPED_CODE_ZONE=1"
 
 # Prefer clang over gcc if available
 if [ -n "$(command -v clang || true)" ]; then CC=clang; else CC=gcc; fi

building/linux64ARMv8/squeak.stack.spur/build/mvm

@@ -3,13 +3,8 @@ set -e
 # Stack Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=sqstkspur64ARMv8linuxht
 OPT="-g -O2 -DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV"
-### OPT="-g -O2 -DNDEBUG -DDEBUGVM=0"
 
-if [ `uname` = "OpenBSD" ]; then
-    DUALMAP="-DDUAL_MAPPED_CODE_ZONE=0"
-else
-    DUALMAP="-DDUAL_MAPPED_CODE_ZONE=1"
-fi
+DUALMAP="-DDUAL_MAPPED_CODE_ZONE=1"
 
 # Prefer clang over gcc if available
 if [ -n "$(command -v clang || true)" ]; then CC=clang; else CC=gcc; fi

building/linux64x64/squeak.cog.spur/build.assert.itimerheartbeat/mvm

@@ -2,7 +2,13 @@
 set -e
 # assert VM with VM profiler and itimer heartbeat
 INSTALLDIR=assert/sqcogspur64linux
-OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
+OPT="-g3 -O1 -DDEBUGVM=0"
+
+# librt and libpthread funs now supplied by libc
+# Many Linux systems supply empty library files 
+CFLAGS="$CFLAGS $OPT -msse2 -DCOGMTVM=0"
+LIBS="$LIBS -lrt"
+LDFLAGS="$LDFLAGS"
 
 # Prefer clang over gcc if available
 if [ -n "$(command -v clang || true)" ]; then CC=clang; else CC=gcc; fi

building/linux64x64/squeak.cog.spur/build.assert/mvm

@@ -2,26 +2,16 @@
 set -e
 # assert VM with VM profiler and threaded heartbeat
 INSTALLDIR=assert/sqcogspur64linuxht
-OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
+OPT="-g3 -O1 -DDEBUGVM=0"
 
 # Prefer clang over gcc if available
 if [ -n "$(command -v clang || true)" ]; then CC=clang; else CC=gcc; fi
 
 # librt and libpthread funs now supplied by libc
 # Many Linux systems supply empty library files 
-# but OpenBSD does not.
-if [ `uname` = "OpenBSD" ]; then LIBRT=""; else LIBRT="-lrt"; fi
-
-CFLAGS="$OPT -msse2 -DCOGMTVM=0"
-LIBS=$LIBRT
-LDFLAGS=""
-
-# Special treatment for OpenBSD Linux
-if [ `uname` = "OpenBSD" ]; then
-	CFLAGS="$CFLAGS -I/usr/local/include"
-	LIBS="$LIBS -lexecinfo"
-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
-fi
+CFLAGS="$CFLAGS $OPT -msse2 -DCOGMTVM=0"
+LIBS="$LIBS -lrt"
+LDFLAGS="$LDFLAGS"
 
 if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift

building/linux64x64/squeak.cog.spur/build.debug.itimerheartbeat/mvm

@@ -4,6 +4,12 @@ set -e
 INSTALLDIR=debug/sqcogspur64linux
 OPT="-g3 -O0 -DDEBUGVM=1"
 
+# librt and libpthread funs now supplied by libc
+# Many Linux systems supply empty library files 
+CFLAGS="$CFLAGS $OPT -msse2 -DCOGMTVM=0"
+LIBS="$LIBS -lrt"
+LDFLAGS="$LDFLAGS"
+
 # Prefer clang over gcc if available
 if [ -n "$(command -v clang || true)" ]; then CC=clang; else CC=gcc; fi
 

building/linux64x64/squeak.cog.spur/build.debug/mvm

@@ -4,24 +4,14 @@ set -e
 INSTALLDIR=debug/sqcogspur64linuxht
 OPT="-g3 -O0 -DDEBUGVM=1"
 
-# Prefer clang over gcc if available
-if [ -n "$(command -v clang || true)" ]; then CC=clang; else CC=gcc; fi
-
 # librt and libpthread funs now supplied by libc
 # Many Linux systems supply empty library files 
-# but OpenBSD does not.
-if [ `uname` = "OpenBSD" ]; then LIBRT=""; else LIBRT="-lrt"; fi
-
-CFLAGS="$OPT -msse2 -DCOGMTVM=0"
-LIBS=$LIBRT
-LDFLAGS=""
+CFLAGS="$CFLAGS $OPT -msse2 -DCOGMTVM=0"
+LIBS="$LIBS -lrt"
+LDFLAGS="$LDFLAGS"
 
-# Special treatment for OpenBSD Linux
-if [ `uname` = "OpenBSD" ]; then
-	CFLAGS="$CFLAGS -I/usr/local/include"
-	LIBS="$LIBS -lexecinfo"
-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
-fi
+# Prefer clang over gcc if available
+if [ -n "$(command -v clang || true)" ]; then CC=clang; else CC=gcc; fi
 
 if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift

building/linux64x64/squeak.cog.spur/build/mvm

@@ -10,20 +10,9 @@ if [ -n "$(command -v clang || true)" ]; then CC=clang; else CC=gcc; fi
 
 # librt and libpthread funs now supplied by libc
 # Many Linux systems supply empty library files 
-# but OpenBSD does not.
-if [ `uname` = "OpenBSD" ]; then LIBRT=""; else LIBRT="-lrt"; fi
-
-# Special treatment for OpenBSD Linux
-if [ `uname` = "OpenBSD" ]; then
-	OPT="$OPT -DMUSL"
-	CFLAGS="$CFLAGS $OPT -I/usr/local/include"
-	LIBS="$LIBS -lexecinfo"
-	LDFLAGS="$LDFLAGS -L/usr/local/lib"
-else
-	CFLAGS="$CFLAGS $OPT -msse2 -DCOGMTVM=0"
-	LIBS="$LIBS -lrt"
-	LDFLAGS="$LDFLAGS"
-fi
+CFLAGS="$CFLAGS $OPT -msse2 -DCOGMTVM=0"
+LIBS="$LIBS -lrt"
+LDFLAGS="$LDFLAGS"
 
 if [ $# -ge 1 ]; then
 	INSTALLDIR="$1"; shift

building/linux64x64/squeak.sista.spur/build.assert/mvm

@@ -2,7 +2,7 @@
 set -e
 # assert Sista Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=assert/sqsisspur64linuxht
-OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
+OPT="-g3 -O1 -DDEBUGVM=0"
 
 # Prefer clang over gcc, but use gcc if clang isn't available...
 CC=gcc

building/linux64x64/squeak.stack.spur/build.assert/mvm

@@ -2,7 +2,7 @@
 set -e
 # assert Stack Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=assert/sqstkspur64linuxht
-OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
+OPT="-g3 -O1 -DDEBUGVM=0"
 
 # Prefer clang over gcc, but use gcc if clang isn't available...
 CC=gcc