hrev44242 adds 1 changeset to branch 'master' old head: d8bddb6d016d83100cb2725103b1c0b54ed4a0dc new head: e949483f2c78ff6ebc6f2222e0069f2472071d13 ---------------------------------------------------------------------------- e949483: mesa: Remove no longer needed patch * Commited upstream to Mesa in: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb3054c849d84 [ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev44242 Commit: e949483f2c78ff6ebc6f2222e0069f2472071d13 URL: http://cgit.haiku-os.org/haiku/commit/?id=e949483 Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> Date: Thu Jun 14 15:17:30 2012 UTC ---------------------------------------------------------------------------- 1 file changed, 27 deletions(-) 3rdparty/mesa/Mesa-8.1devel-archfix.diff | 27 -------------------------- ---------------------------------------------------------------------------- diff --git a/3rdparty/mesa/Mesa-8.1devel-archfix.diff b/3rdparty/mesa/Mesa-8.1devel-archfix.diff deleted file mode 100644 index b958602..0000000 --- a/3rdparty/mesa/Mesa-8.1devel-archfix.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/scons/gallium.py b/scons/gallium.py -index 2fa80db..b99e753 100755 ---- a/scons/gallium.py -+++ b/scons/gallium.py -@@ -327,7 +327,7 @@ def generate(env): - #'-march=pentium4', - ] - if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.2') \ -- and (platform != 'windows' or env['build'] == 'debug' or True): -+ and platform not in ['windows', 'haiku']: - # NOTE: We need to ensure stack is realigned given that we - # produce shared objects, and have no control over the stack - # alignment policy of the application. Therefore we need -@@ -343,6 +343,13 @@ def generate(env): - '-mmmx', '-msse', '-msse2', # enable SIMD intrinsics - #'-mfpmath=sse', - ] -+ if platform in ['haiku']: -+ ccflags += [ -+ '-mstackrealign', # ensure stack is aligned -+ '-march=i586', # Haiku target is Pentium -+ '-mtune=i686', # Use i686 where we can -+ '-mmmx', # Use mmx math where we can -+ ] - if platform in ['windows', 'darwin']: - # Workaround http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37216 - ccflags += ['-fno-common']