Merge pull request #235 from OpenSmalltalk/compile_sista_with_clang

Compile sista with clang

Author: nicolas-cellier-aka-nice

.appveyor.yml

@@ -3,37 +3,47 @@ environment:
   BINTRAYAPIKEY:
     secure: uknPzww818XWJiLecwur9p1MfrkACOyx9d3iNrw/TuD89EoPSc8zLqKdPZjWdcQd
   matrix:
-    - FLAVOR: squeak.sista.spur
+    - FLAVOR: squeak.cog.spur
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
     - FLAVOR: squeak.cog.spur
+      ARCH: win64x64
+      CYG_ROOT: C:\cygwin64
+      CYG_SETUP: setup-x86_64.exe
+      MINGW_ARCH: x86_64
+    - FLAVOR: pharo.cog.spur
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
-    - FLAVOR: squeak.cog.spur.lowcode
+    - FLAVOR: pharo.cog.spur
+      ARCH: win64x64
+      CYG_ROOT: C:\cygwin64
+      CYG_SETUP: setup-x86_64.exe
+      MINGW_ARCH: x86_64
+    - FLAVOR: squeak.sista.spur
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
-    - FLAVOR: squeak.cog.v3
+    - FLAVOR: squeak.cog.spur.lowcode
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
-    - FLAVOR: squeak.stack.spur
+    - FLAVOR: squeak.cog.v3
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
-    - FLAVOR: squeak.stack.v3
+    - FLAVOR: squeak.stack.spur
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
-    - FLAVOR: pharo.cog.spur
+    - FLAVOR: squeak.stack.v3
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
@@ -58,16 +68,6 @@ environment:
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
-    - FLAVOR: squeak.cog.spur
-      ARCH: win64x64
-      CYG_ROOT: C:\cygwin64
-      CYG_SETUP: setup-x86_64.exe
-      MINGW_ARCH: x86_64
-    - FLAVOR: pharo.cog.spur
-      ARCH: win64x64
-      CYG_ROOT: C:\cygwin64
-      CYG_SETUP: setup-x86_64.exe
-      MINGW_ARCH: x86_64
     # - FLAVOR: pharo.sista.spur
     #   ARCH: win64x64
     #   CYG_ROOT: C:\cygwin64
@@ -113,8 +113,8 @@ cache:
   - .thirdparty-cache
 
 install:
-  - ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"'
-  - ps: 'Start-FileDownload "http://cygwin.com/setup-x86_64.exe" -FileName "setup-x86_64.exe"'
+  - 'curl -fsSL --retry 4 -m 600 -o "setup-x86.exe" "http://cygwin.com/setup-x86.exe" '
+  - 'curl -fsSL --retry 4 -m 600 -o "setup-x86_64.exe" "http://cygwin.com/setup-x86_64.exe" '
   - '%CYG_SETUP% -dgnqNO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_ROOT%\var\cache\setup" -P mingw64-%MINGW_ARCH%-gcc-core,mingw64-%MINGW_ARCH%-gcc-g++,mingw64-%MINGW_ARCH%-headers,mingw64-%MINGW_ARCH%-runtime,zip,mingw64-%MINGW_ARCH%-clang,mingw64-%MINGW_ARCH%-openssl,libiconv-devel,libglib2.0-devel,perl,mingw64-%MINGW_ARCH%-zlib,make,cmake,wget,mingw64-%MINGW_ARCH%-win-iconv'
 
 # Cygwin build script

.travis.yml

@@ -23,42 +23,46 @@ notifications:
 jobs:
   fast_finish: true
   include:
-  - stage: "Linux builds"
-    env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
+  - stage: "Main Squeak and Pharo builds"
+    env: ARCH="linux32x86" FLAVOR="squeak.cog.spur"
+  - env: ARCH="macos32x86" FLAVOR="squeak.cog.spur"
+    <<: *mac-build
   - env: ARCH="linux64x64" FLAVOR="squeak.cog.spur"
+  - env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
+    <<: *mac-build
+  - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
+  - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
+    <<: *mac-build
   - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
+  - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
+    <<: *mac-build
+
+  - stage: "Other Linux builds"
+    env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
   - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
   # - env: ARCH="linux64x64" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
   - env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur"
-  - env: ARCH="linux32x86" FLAVOR="squeak.cog.spur"
   - env: ARCH="linux32x86" FLAVOR="squeak.cog.v3"
   - env: ARCH="linux32x86" FLAVOR="squeak.sista.spur"
-  - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
   - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
   - env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
-  - env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="itimer"
+    compiler: clang
+  - env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="itimer" 
+    compiler: clang
 
-  - stage: "Mac builds"
+  - stage: "Other Mac builds"
     env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
     <<: *mac-build
-  - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
-    <<: *mac-build
   # - env: ARCH="macos64x64" FLAVOR="pharo.sista.spur"
   #   <<: *mac-build
   - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur.lowcode"
     <<: *mac-build
-  - env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
-    <<: *mac-build
   - env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
     <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
-    <<: *mac-build
   - env: ARCH="macos32x86" FLAVOR="pharo.sista.spur"
     <<: *mac-build
   - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur.lowcode"
     <<: *mac-build
-  - env: ARCH="macos32x86" FLAVOR="squeak.cog.spur"
-    <<: *mac-build
   - env: ARCH="macos32x86" FLAVOR="squeak.cog.v3"
     <<: *mac-build
   - env: ARCH="macos32x86" FLAVOR="squeak.sista.spur"

build.linux32x86/pharo.sista.spur/build/mvm

@@ -33,11 +33,12 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 
-test -f config.h || ../../../platforms/unix/config/configure \
+test -f config.h || CC=clang ../../../platforms/unix/config/configure \
 		--without-npsqueak \
 		--with-vmversion=5.0 \
 		--with-src=spursistasrc \
 	TARGET_ARCH="-m32" \
+	CC=clang \
 	CFLAGS="$OPT -msse2 -DCOGMTVM=0" \
 	LDFLAGS="-Wl,-rpath,'\$\$ORIGIN' "
 rm -f vm/sqUnixMain.o # nuke version info

build.win32x86/pharo.cog.spur.lowcode/Makefile

@@ -15,6 +15,8 @@ VMSRCDIR:=../../spurlowcodesrc/vm
 #COGDEFS:= -DPharoVM=1 -DSTACK_ALIGN_BYTES=16 -DALLOCA_LIES_SO_USE_GETSP=0
 COGDEFS:= -DPharoVM=1
 
+COMPILER_TO_USE:=clang
+
 THIRDPARTYLIBS:=pkgconfig openssl libssh2 libgit2 libsdl2 zlib libpng freetype2 pixman cairo libgcc
 
 include ../common/Makefile

build.win32x86/pharo.sista.spur/Makefile

@@ -17,6 +17,8 @@ COGDEFS:= -DPharoVM=1
 
 THIRDPARTYLIBS:=pkgconfig openssl libssh2 libgit2 libsdl2 zlib libpng freetype2 pixman cairo libgcc
 
+COMPILER_TO_USE:=clang
+
 include ../common/Makefile
 
 # third-party libraries
@@ -35,4 +37,4 @@ include ../third-party/Makefile.libgcc
 
 # Since SDLDisplayPlugin will be included as internal plugin, we need to add the library to the path
 # add to the end to allow thirdparty vars to be defined.
-STDLIBS+= -L$(THIRDPARTYOUTDIR)/lib -lSDL2
+STDLIBS+= -L$(THIRDPARTYOUTDIR)/lib -lSDL2

platforms/unix/vm-sound-ALSA/sqUnixSoundALSA.c

@@ -670,7 +670,7 @@ mixer_default_volume_get_set(int captureFlag, double *get, double set)
 
 	if (mixer.error) {
 		mixer_close(&mixer);
-		return;
+		return -1;
 	}
 
 	/* Iterate over all mixer controls */