From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from fencepost.gnu.org (fencepost.gnu.org [IPv6:2001:470:142:3::e]) by sourceware.org (Postfix) with ESMTPS id 21BCF3858D28 for ; Sat, 6 May 2023 11:52:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 21BCF3858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gnu.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gnu.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=In-Reply-To:MIME-Version:References:Subject:To:From: Date; bh=cCaUdIYa8PI5Uo9Ul1LQrCUEU0kvBdgpCPqe2/yBatU=; b=nQL1I3C1pax9PM9yMLsk oNLdjob/wA7PE8IAzGGxWRNXiqhoFtq0zBa5buRrfPPlGP2oN/C76W+1trzxB1h85qSAgQWNaQpCe MUmpWsTzxiYjULMFOxUk9yRaMXaZPlK8DMzC+VkyYYS5RX2pjjDk5EshbAVRpNSsHbtjefZygzp1A cqO9VKVNa1ySAhTv0aDSGMo091mwNwoMbbZR1n/Tj685KxIqGaXycOjDE2f9hNPwhstAriQT+diI/ SlF1t2uQTXf9dIb8FHTuMAj5qQTHh44lca8N+g6BoKXecX2SjEpAwqEx7InVzrq4PjziW795ndALO v9lyPwSs2tg+/w==; Received: from lfbn-bor-1-1163-184.w92-158.abo.wanadoo.fr ([92.158.138.184] helo=begin) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvGT3-0002bU-TN; Sat, 06 May 2023 07:52:50 -0400 Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1pvGQu-009Z5D-2S; Sat, 06 May 2023 13:50:36 +0200 Date: Sat, 6 May 2023 13:50:36 +0200 From: Samuel Thibault To: gcc-patches@gcc.gnu.org Cc: Thomas Schwinge , bug-hurd@gnu.org Subject: [PATCH] hurd: Add multilib paths for gnu-x86_64 Message-ID: <20230506115036.pvng4w6wztcimzrh@begin> Mail-Followup-To: gcc-patches@gcc.gnu.org, Thomas Schwinge , bug-hurd@gnu.org References: <20110413064931.woxgk0qnqm8swoow-nzlynne@webmail.spamcop.net> <874jrt25bb.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <874jrt25bb.fsf@euler.schwinge.homeip.net> Organization: I am not organized User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_NUMSUBJECT,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: We need the multilib paths in gcc to find e.g. glibc crt files on Debian. This is essentially based on t-linux64 version. gcc/ChangeLog: * gcc/config/i386/t-gnu64: New file. * gcc/config.gcc [x86_64-*-gnu*): Add i386/t-gnu64 to tmake_file. diff --git a/gcc/config.gcc b/gcc/config.gcc index 671c7e3b018..6b1939b9f09 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -5828,6 +5828,9 @@ case ${target} in visium-*-*) target_cpu_default2="TARGET_CPU_$with_cpu" ;; + x86_64-*-gnu*) + tmake_file="$tmake_file i386/t-gnu64" + ;; esac t= diff --git a/gcc/config/i386/t-gnu64 b/gcc/config/i386/t-gnu64 index e69de29bb2d..23ee6823d65 100644 --- a/gcc/config/i386/t-gnu64 +++ b/gcc/config/i386/t-gnu64 @@ -0,0 +1,38 @@ +# Copyright (C) 2002-2023 Free Software Foundation, Inc. +# +# This file is part of GCC. +# +# GCC is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GCC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING3. If not see +# . + +# On Debian, Ubuntu and other derivative distributions, the 32bit libraries +# are found in /lib32 and /usr/lib32, /lib64 and /usr/lib64 are symlinks to +# /lib and /usr/lib, while other distributions install libraries into /lib64 +# and /usr/lib64. The LSB does not enforce the use of /lib64 and /usr/lib64, +# it doesn't tell anything about the 32bit libraries on those systems. Set +# MULTILIB_OSDIRNAMES according to what is found on the target. + +# To support i386, x86-64 and x32 libraries, the directory structrue +# should be: +# +# /lib has i386 libraries. +# /lib64 has x86-64 libraries. +# /libx32 has x32 libraries. +# +comma=, +MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) +MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) +MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-gnu) +MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-gnu) +MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-gnux32)