[1/2,Ada] Compile s-mmap and 128bit on x86_64-linux-gnux32

Message ID 20220119020955.54413-1-hjl.tools@gmail.com
State Committed
Commit 9d6c63ba490ec92245f04b5cbafc56abd28e8d22
Headers
Series [1/2,Ada] Compile s-mmap and 128bit on x86_64-linux-gnux32 |

Commit Message

H.J. Lu Jan. 19, 2022, 2:09 a.m. UTC
  PR ada/103538
	* Makefile.rtl (LIBGNAT_TARGET_PAIRS): Add
	$(TRASYM_DWARF_UNIX_PAIRS),
	s-tsmona.adb<libgnat/s-tsmona__linux.adb,
	$(GNATRTL_128BIT_PAIRS).
	(EXTRA_GNATRTL_NONTASKING_OBJS): Add $(TRASYM_DWARF_UNIX_OBJS)
	and $(GNATRTL_128BIT_OBJS).
---
 gcc/ada/Makefile.rtl | 5 +++++
 1 file changed, 5 insertions(+)
  

Comments

Arnaud Charlet Jan. 19, 2022, 9:06 a.m. UTC | #1
OK, thanks.

> 	PR ada/103538
> 	* Makefile.rtl (LIBGNAT_TARGET_PAIRS): Add
> 	$(TRASYM_DWARF_UNIX_PAIRS),
> 	s-tsmona.adb<libgnat/s-tsmona__linux.adb,
> 	$(GNATRTL_128BIT_PAIRS).
> 	(EXTRA_GNATRTL_NONTASKING_OBJS): Add $(TRASYM_DWARF_UNIX_OBJS)
> 	and $(GNATRTL_128BIT_OBJS).
> ---
>  gcc/ada/Makefile.rtl | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
> index 1b066ad6b14..6d60aea75a8 100644
> --- 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
>  
>    TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
>  
>    EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
> +  EXTRA_GNATRTL_NONTASKING_OBJS+=$(TRASYM_DWARF_UNIX_OBJS)
> +  EXTRA_GNATRTL_NONTASKING_OBJS+=$(GNATRTL_128BIT_OBJS)
>    EXTRA_GNATRTL_TASKING_OBJS=s-linux.o a-exetim.o
>    EH_MECHANISM=-gcc
>    THREADSLIB=-lpthread -lrt
> -- 
> 2.34.1
>
  
H.J. Lu Jan. 19, 2022, 1:20 p.m. UTC | #2
On Wed, Jan 19, 2022 at 1:06 AM Arnaud Charlet <charlet@adacore.com> wrote:
>
> OK, thanks.

OK for backports?

Thanks.

> >       PR ada/103538
> >       * Makefile.rtl (LIBGNAT_TARGET_PAIRS): Add
> >       $(TRASYM_DWARF_UNIX_PAIRS),
> >       s-tsmona.adb<libgnat/s-tsmona__linux.adb,
> >       $(GNATRTL_128BIT_PAIRS).
> >       (EXTRA_GNATRTL_NONTASKING_OBJS): Add $(TRASYM_DWARF_UNIX_OBJS)
> >       and $(GNATRTL_128BIT_OBJS).
> > ---
> >  gcc/ada/Makefile.rtl | 5 +++++
> >  1 file changed, 5 insertions(+)
> >
> > diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
> > index 1b066ad6b14..6d60aea75a8 100644
> > --- 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
> >
> >    TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
> >
> >    EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
> > +  EXTRA_GNATRTL_NONTASKING_OBJS+=$(TRASYM_DWARF_UNIX_OBJS)
> > +  EXTRA_GNATRTL_NONTASKING_OBJS+=$(GNATRTL_128BIT_OBJS)
> >    EXTRA_GNATRTL_TASKING_OBJS=s-linux.o a-exetim.o
> >    EH_MECHANISM=-gcc
> >    THREADSLIB=-lpthread -lrt
> > --
> > 2.34.1
> >
  
Arnaud Charlet Jan. 19, 2022, 1:39 p.m. UTC | #3
> OK for backports?

Yes.
  

Patch

diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
index 1b066ad6b14..6d60aea75a8 100644
--- 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
 
   TOOLS_TARGET_PAIRS = indepsw.adb<indepsw-gnu.adb
 
   EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
+  EXTRA_GNATRTL_NONTASKING_OBJS+=$(TRASYM_DWARF_UNIX_OBJS)
+  EXTRA_GNATRTL_NONTASKING_OBJS+=$(GNATRTL_128BIT_OBJS)
   EXTRA_GNATRTL_TASKING_OBJS=s-linux.o a-exetim.o
   EH_MECHANISM=-gcc
   THREADSLIB=-lpthread -lrt