From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 8 Jan 2015 16:27:40 +0000 (+0000)
Subject: Revert "Try using incoming-stack-boundary=2 instead of stackrealign."
X-Git-Tag: xonotic-v0.8.0~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=85cf6fd7f85f5e0cecf935642e9bedd345403220;p=xonotic%2Fdarkplaces.git

Revert "Try using incoming-stack-boundary=2 instead of stackrealign."

This reverts commit 438bc57b1be1f24b067056c8d26c1cf9e0cab26b.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12125 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=e79ce28dd6cb182be0fdc22cb79a21ed144bf409
---

diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh
index 4dc99b10..72f8dc08 100755
--- a/.travis-script-xonotic.sh
+++ b/.travis-script-xonotic.sh
@@ -55,14 +55,14 @@ for os in "$@"; do
       ;;
     win32)
       chroot=
-      # -mincoming-stack-boundary=2 works around SDL2-2.0.3 issue that stack is not 16 bytes aligned, breaking SSE.
+      # -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 -mincoming-stack-boundary=2 -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6"
+        CC="i686-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -mstackrealign -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6"
         WINDRES="i686-w64-mingw32-windres"
         SDL_CONFIG="../../../${deps}/bin/sdl2-config"
         DP_LINK_CRYPTO=dlopen