public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [PATCH 1/2] [Ada] Compile s-mmap and 128bit on x86_64-linux-gnux32
@ 2022-01-19  2:09 H.J. Lu
  2022-01-19  2:09 ` [PATCH 2/2] [Ada] Set target_cpu to x32 for x86_64-linux-gnux32 H.J. Lu
  2022-01-19  9:06 ` [PATCH 1/2] [Ada] Compile s-mmap and 128bit on x86_64-linux-gnux32 Arnaud Charlet
  0 siblings, 2 replies; 8+ messages in thread
From: H.J. Lu @ 2022-01-19  2:09 UTC (permalink / raw)
  To: gcc-patches; +Cc: Eric Botcazou

	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


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 2/2] [Ada] Set target_cpu to x32 for x86_64-linux-gnux32
  2022-01-19  2:09 [PATCH 1/2] [Ada] Compile s-mmap and 128bit on x86_64-linux-gnux32 H.J. Lu
@ 2022-01-19  2:09 ` H.J. Lu
  2022-01-19  9:06   ` Arnaud Charlet
  2022-01-19  9:06 ` [PATCH 1/2] [Ada] Compile s-mmap and 128bit on x86_64-linux-gnux32 Arnaud Charlet
  1 sibling, 1 reply; 8+ messages in thread
From: H.J. Lu @ 2022-01-19  2:09 UTC (permalink / raw)
  To: gcc-patches; +Cc: Eric Botcazou

Since the x86_64-linux-gnux32 compiler is actually an x32 compiler, set
target_cpu to x32 for x86_64-linux-gnux32.

	PR ada/103538
	* gcc-interface/Makefile.in (target_cpu): Set to x32 for
	x86_64-linux-gnux32.
---
 gcc/ada/gcc-interface/Makefile.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 53d0739470a..b8a24708280 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -350,6 +350,13 @@ ifeq ($(strip $(filter-out x86_64, $(target_cpu))),)
   endif
 endif
 
+# The x86_64-linux-gnux32 compiler is actually an x32 compiler
+ifeq ($(strip $(filter-out x86_64 linux-gnux32%, $(target_cpu) $(target_os))),)
+  ifneq ($(strip $(MULTISUBDIR)),/64)
+    target_cpu:=x32
+  endif
+endif
+
 # The SuSE PowerPC64/Linux compiler is actually a 32-bit PowerPC compiler
 ifeq ($(strip $(filter-out powerpc64 suse linux%, $(target_cpu) $(target_vendor) $(target_os))),)
   target_cpu:=powerpc
-- 
2.34.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/2] [Ada] Compile s-mmap and 128bit on x86_64-linux-gnux32
  2022-01-19  2:09 [PATCH 1/2] [Ada] Compile s-mmap and 128bit on x86_64-linux-gnux32 H.J. Lu
  2022-01-19  2:09 ` [PATCH 2/2] [Ada] Set target_cpu to x32 for x86_64-linux-gnux32 H.J. Lu
@ 2022-01-19  9:06 ` Arnaud Charlet
  2022-01-19 13:20   ` H.J. Lu
  1 sibling, 1 reply; 8+ messages in thread
From: Arnaud Charlet @ 2022-01-19  9:06 UTC (permalink / raw)
  To: H.J. Lu; +Cc: gcc-patches, Eric Botcazou

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
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/2] [Ada] Set target_cpu to x32 for x86_64-linux-gnux32
  2022-01-19  2:09 ` [PATCH 2/2] [Ada] Set target_cpu to x32 for x86_64-linux-gnux32 H.J. Lu
@ 2022-01-19  9:06   ` Arnaud Charlet
  2022-01-19 13:20     ` H.J. Lu
  0 siblings, 1 reply; 8+ messages in thread
From: Arnaud Charlet @ 2022-01-19  9:06 UTC (permalink / raw)
  To: H.J. Lu; +Cc: gcc-patches, Eric Botcazou

OK, thanks.

> Since the x86_64-linux-gnux32 compiler is actually an x32 compiler, set
> target_cpu to x32 for x86_64-linux-gnux32.
> 
> 	PR ada/103538
> 	* gcc-interface/Makefile.in (target_cpu): Set to x32 for
> 	x86_64-linux-gnux32.
> ---
>  gcc/ada/gcc-interface/Makefile.in | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
> index 53d0739470a..b8a24708280 100644
> --- a/gcc/ada/gcc-interface/Makefile.in
> +++ b/gcc/ada/gcc-interface/Makefile.in
> @@ -350,6 +350,13 @@ ifeq ($(strip $(filter-out x86_64, $(target_cpu))),)
>    endif
>  endif
>  
> +# The x86_64-linux-gnux32 compiler is actually an x32 compiler
> +ifeq ($(strip $(filter-out x86_64 linux-gnux32%, $(target_cpu) $(target_os))),)
> +  ifneq ($(strip $(MULTISUBDIR)),/64)
> +    target_cpu:=x32
> +  endif
> +endif
> +
>  # The SuSE PowerPC64/Linux compiler is actually a 32-bit PowerPC compiler
>  ifeq ($(strip $(filter-out powerpc64 suse linux%, $(target_cpu) $(target_vendor) $(target_os))),)
>    target_cpu:=powerpc
> -- 
> 2.34.1
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/2] [Ada] Compile s-mmap and 128bit on x86_64-linux-gnux32
  2022-01-19  9:06 ` [PATCH 1/2] [Ada] Compile s-mmap and 128bit on x86_64-linux-gnux32 Arnaud Charlet
@ 2022-01-19 13:20   ` H.J. Lu
  2022-01-19 13:39     ` Arnaud Charlet
  0 siblings, 1 reply; 8+ messages in thread
From: H.J. Lu @ 2022-01-19 13:20 UTC (permalink / raw)
  To: Arnaud Charlet; +Cc: GCC Patches, Eric Botcazou

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
> >



-- 
H.J.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/2] [Ada] Set target_cpu to x32 for x86_64-linux-gnux32
  2022-01-19  9:06   ` Arnaud Charlet
@ 2022-01-19 13:20     ` H.J. Lu
  2022-01-19 13:39       ` Arnaud Charlet
  0 siblings, 1 reply; 8+ messages in thread
From: H.J. Lu @ 2022-01-19 13:20 UTC (permalink / raw)
  To: Arnaud Charlet; +Cc: GCC Patches, Eric Botcazou

On Wed, Jan 19, 2022 at 1:06 AM Arnaud Charlet <charlet@adacore.com> wrote:
>
> OK, thanks.

OK for backports?

Thanks.

> > Since the x86_64-linux-gnux32 compiler is actually an x32 compiler, set
> > target_cpu to x32 for x86_64-linux-gnux32.
> >
> >       PR ada/103538
> >       * gcc-interface/Makefile.in (target_cpu): Set to x32 for
> >       x86_64-linux-gnux32.
> > ---
> >  gcc/ada/gcc-interface/Makefile.in | 7 +++++++
> >  1 file changed, 7 insertions(+)
> >
> > diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
> > index 53d0739470a..b8a24708280 100644
> > --- a/gcc/ada/gcc-interface/Makefile.in
> > +++ b/gcc/ada/gcc-interface/Makefile.in
> > @@ -350,6 +350,13 @@ ifeq ($(strip $(filter-out x86_64, $(target_cpu))),)
> >    endif
> >  endif
> >
> > +# The x86_64-linux-gnux32 compiler is actually an x32 compiler
> > +ifeq ($(strip $(filter-out x86_64 linux-gnux32%, $(target_cpu) $(target_os))),)
> > +  ifneq ($(strip $(MULTISUBDIR)),/64)
> > +    target_cpu:=x32
> > +  endif
> > +endif
> > +
> >  # The SuSE PowerPC64/Linux compiler is actually a 32-bit PowerPC compiler
> >  ifeq ($(strip $(filter-out powerpc64 suse linux%, $(target_cpu) $(target_vendor) $(target_os))),)
> >    target_cpu:=powerpc
> > --
> > 2.34.1
> >



-- 
H.J.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/2] [Ada] Compile s-mmap and 128bit on x86_64-linux-gnux32
  2022-01-19 13:20   ` H.J. Lu
@ 2022-01-19 13:39     ` Arnaud Charlet
  0 siblings, 0 replies; 8+ messages in thread
From: Arnaud Charlet @ 2022-01-19 13:39 UTC (permalink / raw)
  To: H.J. Lu; +Cc: Arnaud Charlet, GCC Patches, Eric Botcazou

> OK for backports?

Yes.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/2] [Ada] Set target_cpu to x32 for x86_64-linux-gnux32
  2022-01-19 13:20     ` H.J. Lu
@ 2022-01-19 13:39       ` Arnaud Charlet
  0 siblings, 0 replies; 8+ messages in thread
From: Arnaud Charlet @ 2022-01-19 13:39 UTC (permalink / raw)
  To: H.J. Lu; +Cc: Arnaud Charlet, GCC Patches, Eric Botcazou

> > OK, thanks.
> 
> OK for backports?

Yes.

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2022-01-19 13:39 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-19  2:09 [PATCH 1/2] [Ada] Compile s-mmap and 128bit on x86_64-linux-gnux32 H.J. Lu
2022-01-19  2:09 ` [PATCH 2/2] [Ada] Set target_cpu to x32 for x86_64-linux-gnux32 H.J. Lu
2022-01-19  9:06   ` Arnaud Charlet
2022-01-19 13:20     ` H.J. Lu
2022-01-19 13:39       ` Arnaud Charlet
2022-01-19  9:06 ` [PATCH 1/2] [Ada] Compile s-mmap and 128bit on x86_64-linux-gnux32 Arnaud Charlet
2022-01-19 13:20   ` H.J. Lu
2022-01-19 13:39     ` Arnaud Charlet

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).