OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons: Update for the fact that we require GCC 4.2

Browse Source 
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Jose Fonseca
2015-03-04 13:56:35 +00:00
parent d0b1c74b73
commit 6e836d2c86
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scons/gallium.py
View File

@@ -369,20 +369,16 @@ def generate(env):
'HAVE___BUILTIN_FFS', 'HAVE___BUILTIN_FFS',
'HAVE___BUILTIN_FFSLL', 'HAVE___BUILTIN_FFSLL',
'HAVE_FUNC_ATTRIBUTE_FLATTEN', 'HAVE_FUNC_ATTRIBUTE_FLATTEN',
# GCC 3.0
'HAVE_FUNC_ATTRIBUTE_FORMAT',
'HAVE_FUNC_ATTRIBUTE_PACKED',
# GCC 3.4
'HAVE___BUILTIN_CTZ',
'HAVE___BUILTIN_POPCOUNT',
'HAVE___BUILTIN_POPCOUNTLL',
'HAVE___BUILTIN_CLZ',
'HAVE___BUILTIN_CLZLL',
] ]
if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('3'):
cppdefines += [
'HAVE_FUNC_ATTRIBUTE_FORMAT',
'HAVE_FUNC_ATTRIBUTE_PACKED',
]
if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('3.4'):
cppdefines += [
'HAVE___BUILTIN_CTZ',
'HAVE___BUILTIN_POPCOUNT',
'HAVE___BUILTIN_POPCOUNTLL',
'HAVE___BUILTIN_CLZ',
'HAVE___BUILTIN_CLZLL',
]
if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.5'): if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.5'):
cppdefines += ['HAVE___BUILTIN_UNREACHABLE'] cppdefines += ['HAVE___BUILTIN_UNREACHABLE']
env.Append(CPPDEFINES = cppdefines) env.Append(CPPDEFINES = cppdefines)
@@ -420,8 +416,7 @@ def generate(env):
'-m32', '-m32',
#'-march=pentium4', #'-march=pentium4',
] ]
if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.2') \ if platform != 'haiku':
and platform != 'haiku':
# NOTE: We need to ensure stack is realigned given that we # NOTE: We need to ensure stack is realigned given that we
# produce shared objects, and have no control over the stack # produce shared objects, and have no control over the stack
# alignment policy of the application. Therefore we need # alignment policy of the application. Therefore we need