From: Arnaud Charlet <charlet@adacore.com>
To: Matthias Klose <doko@ubuntu.com>
Cc: GCC Patches <gcc-patches@gcc.gnu.org>
Subject: Re: [ada, patch] fix libgnat build on x86_64-linux-gnux32 with glibc <= 2.31
Date: Mon, 7 Nov 2022 13:50:18 +0000 [thread overview]
Message-ID: <20221107135018.GA1845142@adacore.com> (raw)
In-Reply-To: <c12f3e33-3ccc-4c78-20b1-6e64049d74dc@ubuntu.com>
> This was introduced with the fix and backports of PR103530 on
> x86_64-linux-gnux32 with older glibc versions (checked with 2.31), where
> dladdr is still in the libdl.so library, and not included in libc.so as in
> newer glibc versions.
> Linking of libgnat.so fails with
>
> [...]
> /usr/x86_64-linux-gnux32/bin/ld: s-trasym.o: in function
> `system__traceback__symbolic__module_na
> me__getXnn':
> collect2: error: ld returned 1 exit status
> make[8]: *** [gcc-interface/Makefile:677: gnatlib-shared-default] Error 1
>
> https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=9d6c63ba490ec92245f04b5cbafc56abd28e8d22
>
> -- a/gcc/ada/Makefile.rtl
> +++ b/gcc/ada/Makefile.rtl
> @@ -2650,13 +2650,18 @@ ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu)
> $(target_os))),)
> s-tasinf.adb<libgnarl/s-tasinf__linux.adb \
> s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
> s-taspri.ads<libgnarl/s-taspri__posix.ads \
> + $(TRASYM_DWARF_UNIX_PAIRS) \
> + s-tsmona.adb<libgnat/s-tsmona__linux.adb \
> $(ATOMICS_TARGET_PAIRS) \
> $(X86_64_TARGET_PAIRS) \
> + $(GNATRTL_128BIT_PAIRS) \
> system.ads<libgnat/system-linux-x86.ads
>
> The addition of s-tsmona.adb<libgnat/s-tsmona__linux.adb pulls in the
> reference to dladdr, however not setting MISCLIB to -ldl as on other
> architectures
>
> Proposed patch:
>
>
> PR ada/107475
> * Makefile.rtl: Set MISCLIB for x86_64-linux-gnux32.
>
>
> --- a/gcc/ada/Makefile.rtl
> +++ b/gcc/ada/Makefile.rtl
> @@ -2584,6 +2584,7 @@ ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu)
> $(target_os))),)
> EXTRA_GNATRTL_TASKING_OBJS=s-linux.o a-exetim.o
> EH_MECHANISM=-gcc
> THREADSLIB=-lpthread -lrt
> + MISCLIB = -ldl
> GNATLIB_SHARED=gnatlib-shared-dual
> GMEM_LIB = gmemlib
> LIBRARY_VERSION := $(LIB_VERSION)
>
> Ok for the trunk and the branches?
Yes, thanks.
prev parent reply other threads:[~2022-11-07 13:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-31 15:33 Matthias Klose
2022-11-07 13:50 ` Arnaud Charlet [this message]
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=20221107135018.GA1845142@adacore.com \
--to=charlet@adacore.com \
--cc=doko@ubuntu.com \
--cc=gcc-patches@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).