From: divverent Date: Thu, 8 Jan 2015 19:34:37 +0000 (+0000) Subject: Now that SSE is off, we can also kill -mstackrealign. GCC bug worked around! X-Git-Tag: xonotic-v0.8.0~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68496953ed3ba34db693e9eb156af0188c5fbcf0;p=xonotic%2Fdarkplaces.git Now that SSE is off, we can also kill -mstackrealign. GCC bug worked around! git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12130 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=d362ba8238f9fea5fc48c23da31a1e1360b33092 --- diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh index 9f0e9e49..d064d99d 100755 --- a/.travis-script-xonotic.sh +++ b/.travis-script-xonotic.sh @@ -55,14 +55,12 @@ for os in "$@"; do ;; win32) chroot= - # -mstackrealign works around SDL2-2.0.3 issue that stack is not 16 bytes aligned, breaking SSE. - # Please kill once SDL comes to its senses. makeflags='STRIP=: D3D=1 DP_MAKE_TARGET=mingw UNAME=MINGW32 WIN32RELEASE=1 - CC="i686-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -mstackrealign -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" + CC="i686-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" CPUOPTIMIZATIONS="-march=pentium2 -fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math" WINDRES="i686-w64-mingw32-windres" SDL_CONFIG="../../../${deps}/bin/sdl2-config"