diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-09-06 15:40:09 +0200 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-09-06 15:40:39 +0200 |
| commit | bc9512eaa173f3f8a51dc13978291629cc116a71 (patch) | |
| tree | b8a06e8f92e3a60a07d9024ad368163beae4ec34 /config | |
| parent | e525304a4fed79a18cd16d1448e0e17787b95cb6 (diff) | |
android.config: use the gold linker everywhere
Diffstat (limited to 'config')
| -rw-r--r-- | config/android.config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/android.config b/config/android.config index 8bb2421..2a40fe0 100644 --- a/config/android.config +++ b/config/android.config @@ -34,9 +34,9 @@ os.environ['OBJCFLAGS'] = '-g -Os ' ccache = use_ccache and 'ccache ' or '' # Toolchain environment -os.environ['CPPFLAGS'] = "--sysroot=%s -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -DANDROID -DPIC -I%s/usr/include" % (sysroot, sysroot) +os.environ['CPPFLAGS'] = "-fuse-ld=gold --sysroot=%s -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -DANDROID -DPIC -I%s/usr/include" % (sysroot, sysroot) os.environ['CFLAGS'] += "--sysroot=%s -fPIC -DPIC -ffunction-sections -funwind-tables -fstack-protector -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -march=armv5te -mtune=xscale -msoft-float -mthumb -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 -DANDROID -Wa,--noexecstack -I%s/usr/include" % (sysroot, sysroot) -os.environ['LDFLAGS'] = "--sysroot=%s -fPIC -Wl,--no-undefined -Wl,--allow-shlib-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--gc-sections -Wl,-z,nocopyreloc -Wl,-dynamic-linker,/system/bin/linker -L%s/usr/lib %s" % (sysroot, sysroot, os.environ.get('LDFLAGS', '')) +os.environ['LDFLAGS'] = "-fuse-ld=gold --sysroot=%s -fPIC -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--gc-sections -Wl,-z,nocopyreloc -Wl,-dynamic-linker,/system/bin/linker -L%s/usr/lib %s" % (sysroot, sysroot, os.environ.get('LDFLAGS', '')) os.environ['CXXFLAGS']=os.environ['CFLAGS'] def cmd(command): @@ -44,7 +44,7 @@ def cmd(command): os.environ['CC']= '%s%s' % (ccache, cmd('gcc')) os.environ['CXX']= '%s%s' % (ccache, cmd('g++')) -os.environ['LD']= cmd('ld') +os.environ['LD']= cmd('ld.gold') os.environ['CPP']= cmd('cpp') os.environ['RANLIB']= cmd('ranlib') os.environ['AR']= cmd('ar') |