From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id D6392385843D for ; Fri, 11 Feb 2022 12:50:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D6392385843D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 77BE1342F8E; Fri, 11 Feb 2022 12:50:54 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH 1/8] libgloss: i386: simplify target flags Date: Fri, 11 Feb 2022 07:50:47 -0500 Message-Id: <20220211125054.12397-2-vapier@gentoo.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220211125054.12397-1-vapier@gentoo.org> References: <20220211125054.12397-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2022 12:50:58 -0000 Collapse these 3 settings into one variable to make it eaiser to merge into the top-level. --- libgloss/i386/Makefile.in | 4 ++-- libgloss/i386/configure | 13 +++++-------- libgloss/i386/configure.ac | 9 ++++----- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/libgloss/i386/Makefile.in b/libgloss/i386/Makefile.in index 5764d44b122d..4fabce42aefc 100644 --- a/libgloss/i386/Makefile.in +++ b/libgloss/i386/Makefile.in @@ -90,10 +90,10 @@ libcygmon.a: $(CYGMON_OBJS) ${RANLIB} $@ cygmon-salib.o: ${srcdir}/cygmon-salib.c - $(CC) -c $(CFLAGS) @NEED_UNDERSCORE@ @IS_COFF@ @IS_AOUT@ $(<) -o $@ + $(CC) -c $(CFLAGS) $(I386_CPPFLAGS) $(<) -o $@ cygmon-crt0.o: ${srcdir}/cygmon-crt0.S - $(CC) -c $(CFLAGS) @NEED_UNDERSCORE@ @IS_COFF@ @IS_AOUT@ $(<) -o $@ + $(CC) -c $(CFLAGS) $(I386_CPPFLAGS) $(<) -o $@ doc: diff --git a/libgloss/i386/configure.ac b/libgloss/i386/configure.ac index e03620770235..ac1518648146 100644 --- a/libgloss/i386/configure.ac +++ b/libgloss/i386/configure.ac @@ -21,14 +21,16 @@ AC_ARG_PROGRAM AC_PROG_INSTALL +I386_CPPFLAGS= case "$target" in *coff) - IS_COFF="-DCOFF" + I386_CPPFLAGS="-DCOFF" ;; *aout) - IS_AOUT="-DAOUT" + I386_CPPFLAGS="-DAOUT" ;; esac +AC_SUBST(I386_CPPFLAGS) LIB_AC_PROG_CC AS=${AS-as} @@ -37,9 +39,6 @@ AR=${AR-ar} AC_SUBST(AR) LD=${LD-ld} AC_SUBST(LD) -AC_SUBST(IS_COFF) -AC_SUBST(IS_AOUT) -AC_SUBST(NEED_UNDERSCORE) AC_PROG_RANLIB LIB_AM_PROG_AS -- 2.34.1