From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 8A6FD3858D1E; Thu, 10 Feb 2022 01:01:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8A6FD3858D1E 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: m68k: rename $DO to $TARGET X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 401e68c664fe1e8377ef7f8ab59d5ab4a13942da X-Git-Newrev: a49c5fcdb5423983e44567a1c23145fd9fb6e527 Message-Id: <20220210010117.8A6FD3858D1E@sourceware.org> Date: Thu, 10 Feb 2022 01:01:17 +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, 10 Feb 2022 01:01:17 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Da49c5fcdb54= 23983e44567a1c23145fd9fb6e527 commit a49c5fcdb5423983e44567a1c23145fd9fb6e527 Author: Mike Frysinger Date: Tue Feb 8 23:53:13 2022 -0500 libgloss: m68k: rename $DO to $TARGET =20 The common $DO variable is used by the multilib logic to control which target to multiplex. But the m68k subdir is also using $DO to control which target (m68k or fido) to build. As we flatten things to automake, this conflict shows up and breaks the m68k build. Just rename the m68k variable to something unique to avoid it. Diff: --- libgloss/m68k/Makefile.in | 6 +++--- libgloss/m68k/configure | 12 ++++++------ libgloss/m68k/configure.ac | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libgloss/m68k/Makefile.in b/libgloss/m68k/Makefile.in index b9452bad7..42cf2b2d6 100644 --- a/libgloss/m68k/Makefile.in +++ b/libgloss/m68k/Makefile.in @@ -69,7 +69,7 @@ OBJS =3D close.o fstat.o getpid.o isatty.o kill.o \ unlink.o write.o =20 # What targets to build for. This is a list of {m68k,cf} -DO =3D @DO@ +TARGET =3D @TARGET@ =20 # Here is all of the simulator stuff SIM_SCRIPTS =3D sim.ld @@ -200,7 +200,7 @@ HOSTED_OBJS=3D hosted-gdb.o hosted-exit.o $(patsubst un= %,%,$(UNHOSTED_OBJS)) # Host specific makefile fragment comes in here. @host_makefile_frag@ =20 -all :: $(DO:%=3Dall_%) +all :: $(TARGET:%=3Dall_%) =20 # # here's where we build the board support packages for each target @@ -406,7 +406,7 @@ dtor.x: dtor.o ${CRT0} ${srcdir}/mvme135.ld Makefile $= {MVME135_BSP} unlink.o: $(srcdir)/../unlink.c =20 .PHONY: install info dvi doc install-info clean-info -install:: $(DO:%=3Dinstall_%) +install:: $(TARGET:%=3Dinstall_%) =20 =20 .PHONY:install_m68k diff --git a/libgloss/m68k/configure b/libgloss/m68k/configure index 2a9d3f2ae..f5ecb8280 100755 --- a/libgloss/m68k/configure +++ b/libgloss/m68k/configure @@ -587,7 +587,7 @@ LIBOBJS multi_basedir target_makefile_frag_path host_makefile_frag_path -DO +TARGET CPP OBJEXT EXEEXT @@ -2600,7 +2600,7 @@ test "${CCASFLAGS+set}" =3D set || CCASFLAGS=3D$CFLAGS =20 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target cpu family" >&5 $as_echo_n "checking target cpu family... " >&6; } -DO=3Dm68k +TARGET=3Dm68k saved_LDFLAGS=3D"$LDFLAGS" LDFLAGS=3D"-nostdlib -e main" ac_ext=3Dc @@ -3545,7 +3545,7 @@ main () } _ACEOF if ac_fn_c_try_cpp "$LINENO"; then : - DO=3D"cf" + TARGET=3D"cf" fi rm -f conftest.err conftest.i conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3562,12 +3562,12 @@ main () } _ACEOF if ac_fn_c_try_cpp "$LINENO"; then : - DO=3D"fido" + TARGET=3D"fido" fi rm -f conftest.err conftest.i conftest.$ac_ext LDFLAGS=3D$saved_LDFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DO" >&5 -$as_echo "$DO" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TARGET" >&5 +$as_echo "$TARGET" >&6; } =20 =20 host_makefile_frag=3D${srcdir}/../config/default.mh diff --git a/libgloss/m68k/configure.ac b/libgloss/m68k/configure.ac index de35d7934..41b49a530 100644 --- a/libgloss/m68k/configure.ac +++ b/libgloss/m68k/configure.ac @@ -31,7 +31,7 @@ AC_PROG_RANLIB LIB_AM_PROG_AS =20 AC_MSG_CHECKING([target cpu family]) -DO=3Dm68k +TARGET=3Dm68k dnl Temporarily modify LDFLAGS so that link tests will succeed without dnl a C library. Note that we may not have a C librabry yet and that dnl autoconf automatically adds script to check whether we can create @@ -42,14 +42,14 @@ LDFLAGS=3D"-nostdlib -e main" AC_PREPROC_IFELSE([AC_LANG_PROGRAM([#ifndef __mcoldfire__ #error we are not coldfire #endif])], - DO=3D"cf",) + TARGET=3D"cf",) AC_PREPROC_IFELSE([AC_LANG_PROGRAM([#ifndef __mfido__ #error we are not fido #endif])], - DO=3D"fido",) + TARGET=3D"fido",) LDFLAGS=3D$saved_LDFLAGS -AC_MSG_RESULT($DO) -AC_SUBST(DO) +AC_MSG_RESULT($TARGET) +AC_SUBST(TARGET) =20 host_makefile_frag=3D${srcdir}/../config/default.mh target_makefile_frag=3D${srcdir}/../config/default.mt