Skip to content

Commit

Permalink
Merge pull request #438 from OpenSmalltalk/compile_newspeak_with_clang
Browse files Browse the repository at this point in the history
Compile newspeak with clang
  • Loading branch information
nicolas-cellier-aka-nice committed Oct 25, 2019
2 parents 7875a84 + b2dc466 commit acd2efd
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 16 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
Expand Up @@ -155,13 +155,10 @@ jobs:
- env: FLAVOR="pharo.sista.spur"
- env: FLAVOR="squeak.cog.spur.lowcode"
- env: FLAVOR="pharo.cog.spur.lowcode"
- env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
- env: ARCH="macos32x86" FLAVOR="squeak.cog.v3"
- env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur"
- env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
- env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
env: ARCH="linux64x64" FLAVOR="newspeak.stack.spur"
- env: ARCH="linux32x86" FLAVOR="newspeak.stack.spur"
- env: ARCH="macos64x64" FLAVOR="newspeak.stack.spur"
- env: ARCH="macos32x86" FLAVOR="newspeak.stack.spur"
- env: ARCH="linux32ARMv6" FLAVOR="newspeak.cog.spur"
- env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur"
Expand Down
Expand Up @@ -2,7 +2,7 @@
set -e
# assert Spur VM with VM profiler and itimer heartbeat
INSTALLDIR=assert/nscogspur64linux
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"

if [ $# -ge 1 ]; then
case "$1" in
Expand All @@ -25,6 +25,7 @@ test -f config.h || ../../../platforms/unix/config/configure \
--with-src=nsspur64src \
--without-vm-display-fbdev --without-npsqueak \
TARGET_ARCH="-m64" \
CC=clang \
CFLAGS="$OPT -msse2 -DITIMER_HEARTBEAT=1"
rm -f vm/sqUnixMain.o # nuke version info
rm -rf ../../../products/$INSTALLDIR
Expand Down
3 changes: 2 additions & 1 deletion build.linux64x64/newspeak.cog.spur/build.assert/mvm
Expand Up @@ -2,7 +2,7 @@
set -e
# assert Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/nscogspur64linuxht
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"

if [ $# -ge 1 ]; then
case "$1" in
Expand All @@ -25,6 +25,7 @@ test -f config.h || ../../../platforms/unix/config/configure \
--with-src=nsspur64src \
--without-vm-display-fbdev --without-npsqueak \
TARGET_ARCH="-m64" \
CC=clang \
CFLAGS="$OPT -msse2"
rm -f vm/sqUnixMain.o # nuke version info
rm -rf ../../../products/$INSTALLDIR
Expand Down
Expand Up @@ -2,7 +2,7 @@
set -e
# debug Spur VM with VM profiler and itimer heartbeat
INSTALLDIR=debug/nscogspur64linux
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"
OPT="-g3 -O0 -DDEBUGVM=1"

if [ $# -ge 1 ]; then
case "$1" in
Expand All @@ -25,6 +25,7 @@ test -f config.h || ../../../platforms/unix/config/configure \
--with-src=nsspur64src \
--without-vm-display-fbdev --without-npsqueak \
TARGET_ARCH="-m64" \
CC=clang \
CFLAGS="$OPT -msse2 -DITIMER_HEARTBEAT=1"
rm -f vm/sqUnixMain.o # nuke version info
rm -rf ../../../products/$INSTALLDIR
Expand Down
3 changes: 2 additions & 1 deletion build.linux64x64/newspeak.cog.spur/build.debug/mvm
Expand Up @@ -2,7 +2,7 @@
set -e
# debug Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/nscogspur64linuxht
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"
OPT="-g3 -O0 -DDEBUGVM=1"

if [ $# -ge 1 ]; then
case "$1" in
Expand All @@ -25,6 +25,7 @@ test -f config.h || ../../../platforms/unix/config/configure \
--with-src=nsspur64src \
--without-vm-display-fbdev --without-npsqueak \
TARGET_ARCH="-m64" \
CC=clang \
CFLAGS="$OPT -msse2"
rm -f vm/sqUnixMain.o # nuke version info
rm -rf ../../../products/$INSTALLDIR
Expand Down
6 changes: 2 additions & 4 deletions build.linux64x64/newspeak.cog.spur/build.itimerheartbeat/mvm
Expand Up @@ -3,10 +3,7 @@ set -e
# Spur VM with VM profiler and itimer heartbeat
INSTALLDIR=nscogspur64linux
# Some gcc versions create a broken VM using -O2
case $(c99 -dumpversion) in
3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
*) OPT="-g -O2 -DNDEBUG -DDEBUGVM=0";;
esac
OPT="-g -O2 -DNDEBUG -DDEBUGVM=0"

if [ $# -ge 1 ]; then
case "$1" in
Expand All @@ -29,6 +26,7 @@ test -f config.h || ../../../platforms/unix/config/configure \
--with-src=nsspur64src \
--without-vm-display-fbdev --without-npsqueak \
TARGET_ARCH="-m64" \
CC=clang \
CFLAGS="$OPT -msse2 -DITIMER_HEARTBEAT=1"
rm -f vm/sqUnixMain.o # nuke version info
rm -rf ../../../products/$INSTALLDIR
Expand Down
6 changes: 2 additions & 4 deletions build.linux64x64/newspeak.cog.spur/build/mvm
Expand Up @@ -3,10 +3,7 @@ set -e
# VM with VM profiler and threaded heartbeat
INSTALLDIR=nscogspur64linuxht
# Some gcc versions create a broken VM using -O2
case $(c99 -dumpversion) in
3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
*) OPT="-g -O2 -DNDEBUG -DDEBUGVM=0";;
esac
OPT="-g -O2 -DNDEBUG -DDEBUGVM=0"

if [ $# -ge 1 ]; then
case "$1" in
Expand All @@ -29,6 +26,7 @@ test -f config.h || ../../../platforms/unix/config/configure \
--with-src=nsspur64src \
--without-vm-display-fbdev --without-npsqueak \
TARGET_ARCH="-m64" \
CC=clang \
CFLAGS="$OPT -msse2"
rm -f vm/sqUnixMain.o # nuke version info
rm -rf ../../../products/$INSTALLDIR
Expand Down

0 comments on commit acd2efd

Please sign in to comment.