From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id DEB4B3858D20; Thu, 17 Feb 2022 01:25:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DEB4B3858D20 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] libgloss: i386: simplify target flags X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 2a83e65fc2f42f9354081849ba4f71e2aaf10bf4 X-Git-Newrev: e05f9c0c05384754287b0943c165d3ef02880a30 Message-Id: <20220217012537.DEB4B3858D20@sourceware.org> Date: Thu, 17 Feb 2022 01:25:37 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Feb 2022 01:25:38 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3De05f9c0c053= 84754287b0943c165d3ef02880a30 commit e05f9c0c05384754287b0943c165d3ef02880a30 Author: Mike Frysinger Date: Fri Feb 11 06:39:54 2022 -0500 libgloss: i386: simplify target flags =20 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} $@ =20 cygmon-salib.o: ${srcdir}/cygmon-salib.c - $(CC) -c $(CFLAGS) @NEED_UNDERSCORE@ @IS_COFF@ @IS_AOUT@ $(<) -o $@ + $(CC) -c $(CFLAGS) $(I386_CPPFLAGS) $(<) -o $@ =20 cygmon-crt0.o: ${srcdir}/cygmon-crt0.S - $(CC) -c $(CFLAGS) @NEED_UNDERSCORE@ @IS_COFF@ @IS_AOUT@ $(<) -o $@ + $(CC) -c $(CFLAGS) $(I386_CPPFLAGS) $(<) -o $@ =20 doc:=09 =20 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=3D'${IN= STALL}' test -z "$INSTALL_DATA" && INSTALL_DATA=3D'${INSTALL} -m 644' =20 =20 +I386_CPPFLAGS=3D case "$target" in *coff) - IS_COFF=3D"-DCOFF" + I386_CPPFLAGS=3D"-DCOFF" ;; *aout) - IS_AOUT=3D"-DAOUT" + I386_CPPFLAGS=3D"-DAOUT" ;; esac =20 + rm -rf .tst 2>/dev/null mkdir .tst 2>/dev/null if test -d .tst; then @@ -2449,9 +2449,6 @@ AR=3D${AR-ar} =20 LD=3D${LD-ld} =20 - - - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a pr= ogram name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=3D$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 =20 AC_PROG_INSTALL =20 +I386_CPPFLAGS=3D case "$target" in *coff) - IS_COFF=3D"-DCOFF" + I386_CPPFLAGS=3D"-DCOFF" ;; *aout) - IS_AOUT=3D"-DAOUT" + I386_CPPFLAGS=3D"-DAOUT" ;; esac +AC_SUBST(I386_CPPFLAGS) =20 LIB_AC_PROG_CC AS=3D${AS-as} @@ -37,9 +39,6 @@ AR=3D${AR-ar} AC_SUBST(AR) LD=3D${LD-ld} AC_SUBST(LD) -AC_SUBST(IS_COFF) -AC_SUBST(IS_AOUT) -AC_SUBST(NEED_UNDERSCORE) AC_PROG_RANLIB LIB_AM_PROG_AS