From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, 18 Jan 2022 23:54:35 +0000 (-0800)
Subject: [Ada] Set target_cpu to x32 for x86_64-linux-gnux32
X-Git-Tag: upstream/12.2.0~1964
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2cef99175af1ad95283d4b35bced73c3a510f6d6;p=platform%2Fupstream%2Fgcc.git

[Ada] Set target_cpu to x32 for x86_64-linux-gnux32

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

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 53d0739..b8a2470 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