diff mbox series

or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS

Message ID 20220929145740.4846-1-shorne@gmail.com
State Accepted, archived
Headers
Series or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Stafford Horne Sept. 29, 2022, 2:57 p.m. UTC 
  This was found when testing buildroot with linuxthreads enabled.  In
this case, the build passes --disable-tls to the toolchain during
configuration.  After building the OpenRISC toolchain it was still
generating TLS code sequences and causing linker failures such as:

 ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl
 ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr'

This patch fixes this by disabling tls for the OpenRISC target when requested
via --disable-tls.

Tested-by: Yann E. MORIN <yann.morin@orange.com>

gcc/ChangeLog:

	* config/or1k/or1k.cc (TARGET_HAVE_TLS): Only define if
	HAVE_AS_TLS is defined.
---
 gcc/config/or1k/or1k.cc | 2 ++
 1 file changed, 2 insertions(+)

Comments

Stafford Horne Oct. 1, 2022, 11:35 a.m. UTC | #1 
On Thu, Sep 29, 2022 at 03:57:40PM +0100, Stafford Horne wrote:
> This was found when testing buildroot with linuxthreads enabled.  In
> this case, the build passes --disable-tls to the toolchain during
> configuration.  After building the OpenRISC toolchain it was still
> generating TLS code sequences and causing linker failures such as:
> 
>  ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl
>  ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr'
> 
> This patch fixes this by disabling tls for the OpenRISC target when requested
> via --disable-tls.
> 
> Tested-by: Yann E. MORIN <yann.morin@orange.com>
> 
> gcc/ChangeLog:
> 
> 	* config/or1k/or1k.cc (TARGET_HAVE_TLS): Only define if
> 	HAVE_AS_TLS is defined.

I have pushed this upstream now.  Adding buildroot patches should be easy to do
now.

-Stafford
Yann E. MORIN Oct. 1, 2022, 5:53 p.m. UTC | #2 
Stafford, All,

On 2022-10-01 11:35 +0000, Stafford Horne spake thusly:
> On Thu, Sep 29, 2022 at 03:57:40PM +0100, Stafford Horne wrote:
> > This was found when testing buildroot with linuxthreads enabled.  In
> > this case, the build passes --disable-tls to the toolchain during
> > configuration.  After building the OpenRISC toolchain it was still
> > generating TLS code sequences and causing linker failures such as:
> > 
> >  ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl
> >  ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr'
> > 
> > This patch fixes this by disabling tls for the OpenRISC target when requested
> > via --disable-tls.
> > 
> > Tested-by: Yann E. MORIN <yann.morin@orange.com>
> > 
> > gcc/ChangeLog:
> > 
> > 	* config/or1k/or1k.cc (TARGET_HAVE_TLS): Only define if
> > 	HAVE_AS_TLS is defined.
> 
> I have pushed this upstream now.  Adding buildroot patches should be easy to do
> now.

That's great, thanks for fixing this! :-)

I'll poke my work alter-ego on Monday to look at providing the backports
for Buildroot.

Regards,
Yann E. MORIN.
diff mbox series

Patch

diff --git a/gcc/config/or1k/or1k.cc b/gcc/config/or1k/or1k.cc
index da2f59062ba..0ce7b234417 100644
--- a/gcc/config/or1k/or1k.cc
+++ b/gcc/config/or1k/or1k.cc
@@ -2206,8 +2206,10 @@  or1k_output_mi_thunk (FILE *file, tree thunk_fndecl,
 #undef  TARGET_LEGITIMATE_ADDRESS_P
 #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p
 
+#ifdef HAVE_AS_TLS
 #undef  TARGET_HAVE_TLS
 #define TARGET_HAVE_TLS true
+#endif
 
 #undef  TARGET_HAVE_SPECULATION_SAFE_VALUE
 #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed