From: Mike Frysinger <vapier@gentoo.org>
To: newlib@sourceware.org
Subject: [PATCH 1/8] libgloss: i386: simplify target flags
Date: Fri, 11 Feb 2022 07:50:47 -0500 [thread overview]
Message-ID: <20220211125054.12397-2-vapier@gentoo.org> (raw)
In-Reply-To: <20220211125054.12397-1-vapier@gentoo.org>
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
next prev parent reply other threads:[~2022-02-11 12:50 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-11 12:50 [PATCH 0/8] libgloss: more merging of configure scripts Mike Frysinger
2022-02-11 12:50 ` Mike Frysinger [this message]
2022-02-11 12:50 ` [PATCH 2/8] libgloss: merge i386 configure script up a level Mike Frysinger
2022-02-11 12:50 ` [PATCH 3/8] libgloss: merge moxie " Mike Frysinger
2022-02-11 12:50 ` [PATCH 4/8] libgloss: merge mcore " Mike Frysinger
2022-02-11 12:50 ` [PATCH 5/8] libgloss: m68k: switch to AC_NO_EXECUTABLES Mike Frysinger
2022-02-11 12:50 ` [PATCH 6/8] libgloss: merge m68k configure script up a level Mike Frysinger
2022-02-11 12:50 ` [PATCH 7/8] libgloss: merge mn10200 " Mike Frysinger
2022-02-11 12:50 ` [PATCH 8/8] libgloss: merge mn10300 " Mike Frysinger
2022-02-12 10:20 ` [PATCH] libgloss: merge mips " Mike Frysinger
2022-02-16 8:40 ` [PATCH 0/8] libgloss: more merging of configure scripts Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220211125054.12397-2-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=newlib@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).