Message ID | 20211101125003.500945-3-adhemerval.zanella@linaro.org |
---|---|
State | New |
Headers | show |
Series | Fix lld build for armhf | expand |
On 2021-11-01, Adhemerval Zanella wrote: >The lld linker does not support TLSDESC for arm. The have-arm-tls-desc >is a leftover of 56583289b1 to support NaCL. > >Checked on arm-linux-gnueabihf. Thanks! >--- > sysdeps/arm/Makefile | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > >diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile >index fb4164f0d9..da4226c8c8 100644 >--- a/sysdeps/arm/Makefile >+++ b/sysdeps/arm/Makefile >@@ -1,11 +1,6 @@ > gnulib-arch = $(elf-objpfx)libgcc-stubs.a > static-gnulib-arch = $(elf-objpfx)libgcc-stubs.a > >-# All supported build tools support TLS descriptors, but the OS may not. >-ifndef have-arm-tls-desc >-have-arm-tls-desc = yes >-endif >- > ifeq ($(subdir),elf) > sysdep-dl-routines += tlsdesc dl-tlsdesc > sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx >@@ -18,7 +13,7 @@ $(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os > lib-noranlib: $(objpfx)libgcc-stubs.a > > ifeq ($(build-shared),yes) >-ifeq ($(have-arm-tls-desc),yes) >+ifeq (yes,$(have-mtls-dialect-gnu2)) > tests += tst-armtlsdescloc tst-armtlsdescextnow tst-armtlsdescextlazy > modules-names += tst-armtlsdesclocmod > modules-names += tst-armtlsdescextlazymod tst-armtlsdescextnowmod >-- >2.32.0 > Reviewed-by: Fangrui Song <maskray@google.com>
diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile index fb4164f0d9..da4226c8c8 100644 --- a/sysdeps/arm/Makefile +++ b/sysdeps/arm/Makefile @@ -1,11 +1,6 @@ gnulib-arch = $(elf-objpfx)libgcc-stubs.a static-gnulib-arch = $(elf-objpfx)libgcc-stubs.a -# All supported build tools support TLS descriptors, but the OS may not. -ifndef have-arm-tls-desc -have-arm-tls-desc = yes -endif - ifeq ($(subdir),elf) sysdep-dl-routines += tlsdesc dl-tlsdesc sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx @@ -18,7 +13,7 @@ $(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os lib-noranlib: $(objpfx)libgcc-stubs.a ifeq ($(build-shared),yes) -ifeq ($(have-arm-tls-desc),yes) +ifeq (yes,$(have-mtls-dialect-gnu2)) tests += tst-armtlsdescloc tst-armtlsdescextnow tst-armtlsdescextlazy modules-names += tst-armtlsdesclocmod modules-names += tst-armtlsdescextlazymod tst-armtlsdescextnowmod