From patchwork Fri Dec 29 06:24:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82975 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 093693858C39 for ; Fri, 29 Dec 2023 06:24:40 +0000 (GMT) X-Original-To: newlib@sourceware.org Delivered-To: newlib@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 9816D3858D28 for ; Fri, 29 Dec 2023 06:24:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9816D3858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9816D3858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703831066; cv=none; b=NoAfBDF6s9RBtKiUyirDjRWvBQwiIYQmCAoH5M4wnD8BZgqdCsazvdOxiDyaPMbkcXGtIyIqkKqKfic+nr9nujOaEnRI8/+gVgRssa0VGqoWlAkhqek3wVhU+QJGglBuT0+/TITzrR+P0YF9tO7dI9mF/KPqn4oSG4ErtT25Xio= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703831066; c=relaxed/simple; bh=XtKXE/mrLyyloLRI8yC2bC4zKNA/4wbmLnYa3HUzi3w=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=LmZgeYk7xottHN532uPcMvCm9kOEroBQO278Gv6c452tY/yJ2YdkHQWZyeVpQwkVNF8gurFzLFyyRiXsCUpzpNJ6T9hPlGcKiRwUHt2qDXMEQom8nYAFRFOnpagavjSfto+avol+YcCXBvX/A+W2xl58ifszHX5eSocKLx2fOP4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id E9EE2342F64; Fri, 29 Dec 2023 06:24:23 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH] libgloss: sparc: add missing m4 include Date: Fri, 29 Dec 2023 01:24:22 -0500 Message-ID: <20231229062422.325-1-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, 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: newlib@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: newlib-bounces+patchwork=sourceware.org@sourceware.org Commit 8d758283785042589e95c93d7899cecf28ef00ea ("libgloss: merge sparc configure script up a level") missed including the sparc acinclude.m4 file which meant none of the sparc-specific vars were propagating to the sub-makefile. --- libgloss/Makefile.in | 8 +++++++- libgloss/configure | 20 ++++++++++++++++++++ libgloss/configure.ac | 1 + libgloss/sparc/Makefile.in | 2 +- libgloss/sparc/acinclude.m4 | 6 +++--- 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/libgloss/configure.ac b/libgloss/configure.ac index ef368888107d..b5d5f41b1557 100644 --- a/libgloss/configure.ac +++ b/libgloss/configure.ac @@ -334,6 +334,7 @@ m4_include([mcore/acinclude.m4]) m4_include([mips/acinclude.m4]) m4_include([mn10300/acinclude.m4]) m4_include([moxie/acinclude.m4]) +m4_include([sparc/acinclude.m4]) m4_include([xtensa/acinclude.m4]) AC_CACHE_CHECK([for compiler search settings], libc_cv_compiler_isystem, [dnl diff --git a/libgloss/sparc/Makefile.in b/libgloss/sparc/Makefile.in index 4f22cf41c11b..c99d92a63bd7 100644 --- a/libgloss/sparc/Makefile.in +++ b/libgloss/sparc/Makefile.in @@ -170,7 +170,7 @@ sparcl-stub.o: $(srcdir)/sparcl-stub.c $(srcdir)/../debug.h $(srcdir)/../debug.c erc32-stub.o: $(srcdir)/erc32-stub.c $(srcdir)/../debug.h $(srcdir)/../debug.c fixctors.o : $(srcdir)/fixctors.c -$(objdir)/cygmon.ld: @SPARC_CYGMONLDSCRIPTTEMPL@ +$(objdir)/cygmon.ld: $(srcdir)/@SPARC_CYGMONLDSCRIPTTEMPL@ sed 's/TARGET_OBJ_FORMAT/$($(CPU)_OBJ_FORMAT)/g;s/TARGET_RAM_START/$($(CPU)_RAM_START)/g;' < $(<) > $(objdir)/cygmon.ld install: $($(CPU)_INSTALL) diff --git a/libgloss/sparc/acinclude.m4 b/libgloss/sparc/acinclude.m4 index bba852b9a887..a58c7a559c36 100644 --- a/libgloss/sparc/acinclude.m4 +++ b/libgloss/sparc/acinclude.m4 @@ -7,9 +7,9 @@ sparc86x*) SPARC_CPU=SLITE ;; esac AC_SUBST(SPARC_CPU) -SPARC_CYGMONLDSCRIPTTEMPL=${srcdir}/sparc/cygmon.ld.src +SPARC_CYGMONLDSCRIPTTEMPL=cygmon.ld.src case ${target_cpu} in -sparc64*) SPARC_CYGMONLDSCRIPTTEMPL=${srcdir}/sparc/cygmon-sparc64-ld.src ;; -sparclet-*-aout*) SPARC_CYGMONLDSCRIPTTEMPL=${srcdir}/sparc/cygmon.ld.src; AC_CONFIG_FILES([sparc/libsys/Makefile]) ;; +sparc64*) SPARC_CYGMONLDSCRIPTTEMPL=cygmon-sparc64-ld.src ;; +sparclet-*-aout*) SPARC_CYGMONLDSCRIPTTEMPL=cygmon.ld.src; AC_CONFIG_FILES([sparc/libsys/Makefile]) ;; esac AC_SUBST(SPARC_CYGMONLDSCRIPTTEMPL)