From patchwork Sat Sep 3 06:07:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Packard X-Patchwork-Id: 1673812 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=Xyd6EI/j; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MKPX00D4Cz1yhK for ; Sat, 3 Sep 2022 16:10:08 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0B5943856DDF for ; Sat, 3 Sep 2022 06:10:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0B5943856DDF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662185406; bh=gmmKEXc+jS1Hp2j4+j0mEL2UpuRr72U4BKyJKJRSFhY=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=Xyd6EI/jISIGSYFN6O3g8CKHV8HbYYP9bDc5aTbTJ7KzlYgJZ2Cx/KfNZg5rQup+R OBcyXV1RK6Jx3Clh44Elhz/n9CZNQM1Jv4g1TYzAOtODUx5YFa8GtpnHHXP09runJQ AYChcQfBIyW72w4e4xDI8+ic2o3YO1b0UwuGsYZc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 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) 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) Received: by keithp.com (Postfix, from userid 1000) id BFB341E600C7; Fri, 2 Sep 2022 23:07:34 -0700 (PDT) To: gcc-patches@gcc.gnu.org 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 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Keith Packard via Gcc-patches From: Keith Packard Reply-To: Keith Packard Cc: Richard Sandiford Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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. From patchwork Sat Sep 3 06:07:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Packard X-Patchwork-Id: 1673810 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=FVN++OHf; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MKPTv3gbjz1yhd for ; Sat, 3 Sep 2022 16:08:15 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1F9823854156 for ; Sat, 3 Sep 2022 06:08:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1F9823854156 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662185292; bh=M7g/qOY+NWCqfzBUEa3qrsLtWQzWQ3K5YFkmmL2pOeQ=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=FVN++OHfbHtahXhYI9Axq3WldpG3PbMwL/2pepTHYSQeUCrxXCPi5MXTKw4XHkPmD N/SZ/FLEB2uBE9XDH/sWnIHUsNECkWf8VusXuyMei7AZ57uOG7RvNY6y8mpmJcCG3k 3eq8yZdtPyGto7OVUSCJlPL9g7/j5/eOfaJWiOkU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from elaine.keithp.com (home.keithp.com [63.227.221.253]) by sourceware.org (Postfix) with ESMTPS id 4736F3858418 for ; Sat, 3 Sep 2022 06:07:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4736F3858418 Received: from localhost (localhost [127.0.0.1]) by elaine.keithp.com (Postfix) with ESMTP id 5C1973F32F78; Fri, 2 Sep 2022 23:07:51 -0700 (PDT) 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 jE8aVAFJlmZz; Fri, 2 Sep 2022 23:07:51 -0700 (PDT) Received: from keithp.com (unknown [204.134.242.194]) by elaine.keithp.com (Postfix) with ESMTPSA id 32D8B3F32FC4; Fri, 2 Sep 2022 23:07:46 -0700 (PDT) Received: by keithp.com (Postfix, from userid 1000) id C2E3A1E600C9; Fri, 2 Sep 2022 23:07:34 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH 2/3] Add newlib and picolibc as default C library choices Date: Fri, 2 Sep 2022 23:07:06 -0700 Message-Id: <20220903060707.1622470-3-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 X-Spam-Status: No, score=-10.6 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Keith Packard via Gcc-patches From: Keith Packard Reply-To: Keith Packard Cc: Richard Sandiford Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Don't set the DEFAULT_LIBC variable for newlib configurations as that is how it currently works for systems using newlib as the default. Signed-off-by: Keith Packard --- gcc/config.gcc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc/config.gcc b/gcc/config.gcc index bf838b1545d..6f8f13a811a 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -642,7 +642,7 @@ case ${target} in esac # Common C libraries. -tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" +tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4 LIBC_NEWLIB=5 LIBC_PICOLIBC=6" default_libc="" @@ -5789,6 +5789,17 @@ bionic) musl) default_libc=LIBC_MUSL ;; +newlib) + + # Newlib configurations don't set the DEFAULT_LIBC variable, so + # avoid changing those allowing --with-default-libc=newlib but + # don't actually set the DEFAULT_LIBC variable. + + default_libc= + ;; +picolibc) + default_libc=LIBC_PICOLIBC + ;; *) echo "Unknown libc in --with-default-libc=$with_default_libc" 1>&2 exit 1 From patchwork Sat Sep 3 06:07:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Packard X-Patchwork-Id: 1673811 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=itu4t/ZY; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MKPVv2KTFz1yhd for ; Sat, 3 Sep 2022 16:09:11 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 57D1A385AE76 for ; Sat, 3 Sep 2022 06:09:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 57D1A385AE76 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662185349; bh=f4qZtEK2M+DsJd4YU5Tf0W+ct7gzq9Rk/CTyJ7Cj6Jg=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=itu4t/ZYcsC+fMougFCOW8pS5PfjWQqmyoBJAXjKmrCKks3WjER3Rj1k4HYI6Y77q cQyxNY1BxJ6k5z3p/AuItoZoD4KGcD+PZbfNIbI5EOp5KHMQlC+DyGMYJLWjWn7fA+ WhRMEc8pmRBqOnCrehVxEjYB0MV7N4de3XHSkkAQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from elaine.keithp.com (home.keithp.com [63.227.221.253]) by sourceware.org (Postfix) with ESMTPS id 501A1385AC36 for ; Sat, 3 Sep 2022 06:07:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 501A1385AC36 Received: from localhost (localhost [127.0.0.1]) by elaine.keithp.com (Postfix) with ESMTP id 7665C3F32FE9; Fri, 2 Sep 2022 23:07:51 -0700 (PDT) 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 IwGbQ2KV1k6U; Fri, 2 Sep 2022 23:07:51 -0700 (PDT) Received: from keithp.com (unknown [204.134.242.194]) by elaine.keithp.com (Postfix) with ESMTPSA id 3A2933F32FE0; Fri, 2 Sep 2022 23:07:46 -0700 (PDT) Received: by keithp.com (Postfix, from userid 1000) id C5F1F1E600CC; Fri, 2 Sep 2022 23:07:34 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH 3/3] Add '--oslib=' option when default C library is picolibc Date: Fri, 2 Sep 2022 23:07:07 -0700 Message-Id: <20220903060707.1622470-4-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 X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Keith Packard via Gcc-patches From: Keith Packard Reply-To: Keith Packard Cc: Richard Sandiford Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" This option allows targets to insert an OS library after the C library in the LIB_PATH spec file fragment. This library maps a few POSIX APIs used by picolibc to underlying system capabilities. For example, picolibc provides 'libsemihost' on various targets which maps these APIs to semihosting capabilities. This would be used with this option by specifying --oslib=semihost This patch enables --oslib= on arm, nds32, riscv and sh. Signed-off-by: Keith Packard --- gcc/config.gcc | 6 ++++++ gcc/config/arm/elf.h | 5 +++++ gcc/config/nds32/elf.h | 4 ++++ gcc/config/picolibc.opt | 26 ++++++++++++++++++++++++++ gcc/config/riscv/elf.h | 4 ++++ gcc/config/sh/embed-elf.h | 5 +++++ 6 files changed, 50 insertions(+) create mode 100644 gcc/config/picolibc.opt diff --git a/gcc/config.gcc b/gcc/config.gcc index 6f8f13a811a..9bb45ec85ab 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -5813,3 +5813,9 @@ case "$default_libc" in tm_defines="$tm_defines DEFAULT_LIBC=$default_libc" ;; esac + +case "$default_libc" in + LIBC_PICOLIBC) + extra_options="${extra_options} picolibc.opt" + ;; +esac diff --git a/gcc/config/arm/elf.h b/gcc/config/arm/elf.h index 3d111433ede..dc5b9374814 100644 --- a/gcc/config/arm/elf.h +++ b/gcc/config/arm/elf.h @@ -150,3 +150,8 @@ #undef L_floatundisf #endif +#if DEFAULT_LIBC == LIBC_PICOLIBC +#undef LIB_SPEC +#define LIB_SPEC "--start-group %(libgcc) -lc %{-oslib=*:-l%*} --end-group" +#endif + diff --git a/gcc/config/nds32/elf.h b/gcc/config/nds32/elf.h index ebdc18cee2a..b9d2f2485e8 100644 --- a/gcc/config/nds32/elf.h +++ b/gcc/config/nds32/elf.h @@ -34,8 +34,12 @@ " %{shared:-shared}" \ NDS32_RELAX_SPEC +#if DEFAULT_LIBC == LIBC_PICOLIBC +#define LIB_SPEC "--start-group %(libgcc) -lc %{-oslib=*:-l%*} --end-group" +#else #define LIB_SPEC \ " -lc -lgloss" +#endif #define LIBGCC_SPEC \ " -lgcc" diff --git a/gcc/config/picolibc.opt b/gcc/config/picolibc.opt new file mode 100644 index 00000000000..194b3362b03 --- /dev/null +++ b/gcc/config/picolibc.opt @@ -0,0 +1,26 @@ +; Processor-independent options for picolibc. +; +; Copyright (C) 2022 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 +; . + +-oslib +Driver Separate Alias(-oslib=) + +-oslib= +Driver Joined +Specify an OS support library to load after libc. diff --git a/gcc/config/riscv/elf.h b/gcc/config/riscv/elf.h index f3d767c6d42..57471cee702 100644 --- a/gcc/config/riscv/elf.h +++ b/gcc/config/riscv/elf.h @@ -27,9 +27,13 @@ along with GCC; see the file COPYING3. If not see /* Link against Newlib libraries, because the ELF backend assumes Newlib. Handle the circular dependence between libc and libgloss. */ #undef LIB_SPEC +#if DEFAULT_LIBC == LIBC_PICOLIBC +#define LIB_SPEC "--start-group %(libgcc) -lc %{-oslib=*:-l%*} --end-group" +#else #define LIB_SPEC \ "--start-group -lc %{!specs=nosys.specs:-lgloss} --end-group " \ "%{!nostartfiles:%{!nodefaultlibs:%{!nolibc:%{!nostdlib:%:riscv_multi_lib_check()}}}}" +#endif #undef STARTFILE_SPEC #define STARTFILE_SPEC "crt0%O%s crtbegin%O%s" diff --git a/gcc/config/sh/embed-elf.h b/gcc/config/sh/embed-elf.h index 21e51dd0bb9..093bf2800db 100644 --- a/gcc/config/sh/embed-elf.h +++ b/gcc/config/sh/embed-elf.h @@ -34,3 +34,8 @@ along with GCC; see the file COPYING3. If not see %{Os: -lgcc-Os-4-200} \ -lgcc \ %{!Os: -lgcc-Os-4-200}" + +#if DEFAULT_LIBC == LIBC_PICOLIBC +#undef LIB_SPEC +#define LIB_SPEC "--start-group %(libgcc) -lc %{-oslib=*:-l%*} --end-group" +#endif