public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Michael Frysinger <vapier@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] libgloss: i386: simplify target flags
Date: Thu, 17 Feb 2022 01:25:37 +0000 (GMT)	[thread overview]
Message-ID: <20220217012537.DEB4B3858D20@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=e05f9c0c05384754287b0943c165d3ef02880a30

commit e05f9c0c05384754287b0943c165d3ef02880a30
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Fri Feb 11 06:39:54 2022 -0500

    libgloss: i386: simplify target flags
    
    Collapse these 3 settings into one variable to make it easier to
    merge into the top-level.

Diff:
---
 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 5764d44b1..4fabce42a 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 b/libgloss/i386/configure
index 9f9e02bdf..5130920e9 100755
--- a/libgloss/i386/configure
+++ b/libgloss/i386/configure
@@ -589,9 +589,6 @@ host_makefile_frag_path
 CCASFLAGS
 CCAS
 RANLIB
-NEED_UNDERSCORE
-IS_AOUT
-IS_COFF
 LD
 AR
 AS
@@ -607,6 +604,7 @@ am__include
 DEPDIR
 am__leading_dot
 CC
+I386_CPPFLAGS
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
@@ -2017,15 +2015,17 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
+I386_CPPFLAGS=
 case "$target" in
     *coff)
-	IS_COFF="-DCOFF"
+	I386_CPPFLAGS="-DCOFF"
 	;;
     *aout)
-	IS_AOUT="-DAOUT"
+	I386_CPPFLAGS="-DAOUT"
 	;;
 esac
 
+
 rm -rf .tst 2>/dev/null
 mkdir .tst 2>/dev/null
 if test -d .tst; then
@@ -2449,9 +2449,6 @@ AR=${AR-ar}
 
 LD=${LD-ld}
 
-
-
-
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
diff --git a/libgloss/i386/configure.ac b/libgloss/i386/configure.ac
index e03620770..ac1518648 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


                 reply	other threads:[~2022-02-17  1:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20220217012537.DEB4B3858D20@sourceware.org \
    --to=vapier@sourceware.org \
    --cc=newlib-cvs@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).