FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-12-24 01:35:24 +01:00
Code Issues 2 Projects Releases Wiki Activity

waflib: xcompile: fix hardfp linking

Browse Source
This commit is contained in:
Alibek Omarov 2019-05-28 00:29:26 +03:00
parent 1d78d7c720
commit 9145589414
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/waflib/xcompile.py
View File

@ -131,7 +131,7 @@ class Android:
if self.is_hardfloat:
cflags += ['-D_NDK_MATH_NO_SOFTFP=1', '-mhard-float', '-mfloat-abi=hard', '-DLOAD_HARDFP', '-DSOFTFP_LINK']
else:
cflags += ['-mfloat-abi=softfp'] # Tegra 2 sucks
cflags += ['-mfloat-abi=softfp']
else:
# ARMv5 support
cflags += ['-march=armv5te', '-mtune=xscale', '-msoft-float']
@ -139,13 +139,18 @@ class Android:
cflags += ['-mtune=atom', '-march=atom', '-mssse3', '-mfpmath=sse', '-DVECTORIZE_SINCOS', '-DHAVE_EFFICIENT_UNALIGNED_ACCESS']
return cflags
# they go before object list
def linkflags(self):
linkflags = ['--sysroot={0}'.format(self.sysroot())]
return linkflags
def ldflags(self):
ldflags = ['--sysroot={0}'.format(self.sysroot())]
ldflags = ['-lgcc', '-no-canonical-prefixes']
if self.is_arm():
if self.arch == 'armeabi-v7a':
ldflags += ['-march=armv7-a', '-Wl,--fix-cortex-a8']
ldflags += ['-march=armv7-a', '-Wl,--fix-cortex-a8', '-mthumb']
if self.is_hardfloat:
ldflags += ['-Wl,--no-warn-mismatch']
ldflags += ['-Wl,--no-warn-mismatch', '-lm_hard']
else:
ldflags += ['-march=armv5te']
return ldflags
@ -189,11 +194,12 @@ def configure(conf):
conf.environ['CXX'] = android.cxx()
conf.env.CFLAGS += android.cflags()
conf.env.CXXFLAGS += android.cflags()
conf.env.LINKFLAGS += android.ldflags()
conf.env.LINKFLAGS += android.linkflags()
conf.env.LDFLAGS += android.ldflags()
conf.env.HAVE_M = True
if android.is_hardfp():
conf.env.LIB_M = ['m_hard']
conf.env.LIB_M = [] # HACKHACK: libm_hard will be linked anyway, but it should go last
else: conf.env.LIB_M = ['m']
conf.env.PREFIX = '/lib/{0}'.format(android.arch)