public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Stafford Horne <shorne@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-3012] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS
Date: Sat,  1 Oct 2022 10:15:41 +0000 (GMT)	[thread overview]
Message-ID: <20221001101541.EB76D385842E@sourceware.org> (raw)

https://gcc.gnu.org/g:ca01d2526917ec6e54b30472d3aedfd46d4ca585

commit r13-3012-gca01d2526917ec6e54b30472d3aedfd46d4ca585
Author: Stafford Horne <shorne@gmail.com>
Date:   Thu Sep 29 15:32:39 2022 +0100

    or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS
    
    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.
    
    gcc/ChangeLog:
    
            * config/or1k/or1k.cc (TARGET_HAVE_TLS): Only define if
            HAVE_AS_TLS is defined.
    
    Tested-by: Yann E. MORIN <yann.morin@orange.com>

Diff:
---
 gcc/config/or1k/or1k.cc | 2 ++
 1 file changed, 2 insertions(+)

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

                 reply	other threads:[~2022-10-01 10:15 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221001101541.EB76D385842E@sourceware.org \
    --to=shorne@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).