From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from elaine.keithp.com (home.keithp.com [63.227.221.253]) by sourceware.org (Postfix) with ESMTPS id 4790C385AC2A for ; Sat, 3 Sep 2022 06:07:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4790C385AC2A Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=keithp.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=keithp.com Received: from localhost (localhost [127.0.0.1]) by elaine.keithp.com (Postfix) with ESMTP id EBF183F32FE6; Fri, 2 Sep 2022 23:07:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=keithp.com; s=mail; t=1662185270; bh=QBKz0iVuCX1fQUxJE9i5mSwp8MEVtrXSjswNcXtiMl4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oId+CqOYl8a5tiPZNSHNH2LeGDhD5IOIoPBSYSdBROL59jHCdsMBCqE7P+AOXhi2O diWCtPnp0OACsSRcZT91jgepWEiNmDXXHqnLzQnZZzJcTqyCYp4r41l/jdmLHnEBYl 92zfqeacaNKgFdviK2ijLexUYXk6ICYZPPsZI6/wVVEUKFOHtJwPZa84Rs8CSgPz9C LR4zAp1sXqwOJ4CdgyJ89xsNQWJcpa7MxNXNaGApspvT8oOJlLuwmJMoNlFJbCAasx GxAPRJ+bYso/l6TzVXiCxAU5sbtXo29E5bqURivZWRQ3trwmEmvBp8ezAjhuANJc6l CabJAnG572xYg== X-Virus-Scanned: Debian amavisd-new at keithp.com Received: from elaine.keithp.com ([127.0.0.1]) by localhost (elaine.keithp.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id UsHOn9v4MW1K; Fri, 2 Sep 2022 23:07:46 -0700 (PDT) Received: from keithp.com (unknown [204.134.242.194]) by elaine.keithp.com (Postfix) with ESMTPSA id 286473F32F78; Fri, 2 Sep 2022 23:07:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=keithp.com; s=mail; t=1662185266; bh=QBKz0iVuCX1fQUxJE9i5mSwp8MEVtrXSjswNcXtiMl4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FWcEE5qDNpnWlr+4xKawzrxly7JO9W5CQBSxwML2o4rz7WAB5UXCiocYpEHRluXNM oAZt48KskHWk0VPF/IeiT+43E3Vmp/RXE0CvfS5OatSzIrfzZn9jQxteceCXaICQq/ vNYtGFDNyGBx1qINpPbX9nsomrAx8yDuZR9s78I2UqDTXHuiSbEAoz1K59rQ5KnOci gBHb/gfVEelq68DEmAlpE2zD1eGZTb+doj+xEXA5+bumjD1yCwejSRQEjAk8k20ocn XpgxRX1E2STE7Hgb4n3jQGT3SGK2MJeEcBP0/+jInKsFP2Cb8LQog64LqZgX8p+5k9 fyYBmpT9qcxGw== Received: by keithp.com (Postfix, from userid 1000) id BFB341E600C7; Fri, 2 Sep 2022 23:07:34 -0700 (PDT) From: Keith Packard To: gcc-patches@gcc.gnu.org Cc: Keith Packard , Richard Sandiford Subject: [PATCH 1/3] Allow default libc to be specified to configure Date: Fri, 2 Sep 2022 23:07:05 -0700 Message-Id: <20220903060707.1622470-2-keithp@keithp.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220903060707.1622470-1-keithp@keithp.com> References: <20220824180426.820576-1-keithp@keithp.com> <20220903060707.1622470-1-keithp@keithp.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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: The default C library is normally computed based on the target triplet. However, for embedded systems, it can be useful to leave the triplet alone while changing which C library is used by default. Other C libraries may still be available on the system so the compiler and can be used by specifying suitable include and library paths at build time. If an unknown --with-default-libc= value is provided, emit an error and stop. Signed-off-by: Keith Packard --- gcc/config.gcc | 46 ++++++++++++++++++++++++++++++++++++++-------- gcc/configure.ac | 4 ++++ 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/gcc/config.gcc b/gcc/config.gcc index f4e757bd853..bf838b1545d 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -644,6 +644,8 @@ esac # Common C libraries. tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" +default_libc="" + # 32-bit x86 processors supported by --with-arch=. Each processor # MUST be separated by exactly one space. x86_archs="athlon athlon-4 athlon-fx athlon-mp athlon-tbird \ @@ -849,16 +851,16 @@ case ${target} in esac case $target in *-*-*android*) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_BIONIC" + default_libc=LIBC_BIONIC ;; *-*-*uclibc* | *-*-uclinuxfdpiceabi) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" + default_libc=LIBC_UCLIBC ;; *-*-*musl*) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" + default_libc=LIBC_MUSL ;; *) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" + default_libc=LIBC_GLIBC ;; esac # Assume that glibc or uClibc or Bionic are being used and so __cxa_atexit @@ -951,7 +953,8 @@ case ${target} in case ${enable_threads} in "" | yes | posix) thread_file='posix' ;; esac - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC" + tm_defines="$tm_defines SINGLE_LIBC" + default_libc=LIBC_UCLIBC ;; *-*-rdos*) use_gcc_stdint=wrap @@ -1603,13 +1606,13 @@ csky-*-*) case ${target} in csky-*-linux-gnu*) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" + default_libc=LIBC_GLIBC # Force .init_array support. The configure script cannot always # automatically detect that GAS supports it, yet we require it. gcc_cv_initfini_array=yes ;; csky-*-linux-uclibc*) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" + default_libc=LIBC_UCLIBC default_use_cxa_atexit=no ;; *) @@ -2982,7 +2985,7 @@ powerpc*-wrs-vxworks7r*) tmake_file="${tmake_file} t-linux rs6000/t-linux64 rs6000/t-fprules rs6000/t-ppccomm" tmake_file="${tmake_file} rs6000/t-vxworks" - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" + default_libc=LIBC_GLIBC extra_objs="$extra_objs linux.o rs6000-linux.o" ;; powerpc-wrs-vxworks*) @@ -5772,3 +5775,30 @@ i[34567]86-*-* | x86_64-*-*) fi ;; esac + +case "${with_default_libc}" in +glibc) + default_libc=LIBC_GLIBC + ;; +uclibc) + default_libc=LIBC_UCLIBC + ;; +bionic) + default_libc=LIBC_BIONIC + ;; +musl) + default_libc=LIBC_MUSL + ;; +*) + echo "Unknown libc in --with-default-libc=$with_default_libc" 1>&2 + exit 1 + ;; +esac + +case "$default_libc" in +"") + ;; +*) + tm_defines="$tm_defines DEFAULT_LIBC=$default_libc" + ;; +esac diff --git a/gcc/configure.ac b/gcc/configure.ac index 50bb61c1b61..7302c987282 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2472,6 +2472,10 @@ if { { test x$host != x$target && test "x$with_sysroot" = x ; } || fi AC_SUBST(inhibit_libc) +AC_ARG_WITH(default-libc, + [AS_HELP_STRING([--with-default-libc], + [Use specified default C library])]) + # When building gcc with a cross-compiler, we need to adjust things so # that the generator programs are still built with the native compiler. # Also, we cannot run fixincludes. -- 2.36.1