From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <hjl@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1039)
 id 636443857C5F; Wed, 19 Jan 2022 14:36:34 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 636443857C5F
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: H.J. Lu <hjl@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r11-9481] [Ada] Set target_cpu to x32 for x86_64-linux-gnux32
X-Act-Checkin: gcc
X-Git-Author: H.J. Lu <hjl.tools@gmail.com>
X-Git-Refname: refs/heads/releases/gcc-11
X-Git-Oldrev: 892c58d93110e1b30d7ebe93e704f318d16c34a3
X-Git-Newrev: 1d3f5f5e52a123d7da96b659064fc2a4b8de5e64
Message-Id: <20220119143634.636443857C5F@sourceware.org>
Date: Wed, 19 Jan 2022 14:36:34 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Jan 2022 14:36:34 -0000

https://gcc.gnu.org/g:1d3f5f5e52a123d7da96b659064fc2a4b8de5e64

commit r11-9481-g1d3f5f5e52a123d7da96b659064fc2a4b8de5e64
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue Jan 18 15:54:35 2022 -0800

    [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.
    
    (cherry picked from commit 2cef99175af1ad95283d4b35bced73c3a510f6d6)

Diff:
---
 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 836fcbef400..74a21122fb6 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -348,6 +348,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