From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1499) id A5E54385843B; Tue, 7 Sep 2021 17:01:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A5E54385843B Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Gaius Mulley To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/gaius/heads/devel/modula-2)] Fixed libm2iso cross compiler for bare metal by using CC and CFLAGS. X-Act-Checkin: gcc X-Git-Author: Gaius Mulley X-Git-Refname: refs/users/gaius/heads/devel/modula-2 X-Git-Oldrev: 04da1c6dbed0446118255d23813ea3298c0ea73e X-Git-Newrev: 69f11f1cf68e824d9aef7bb23d680584f40c0420 Message-Id: <20210907170117.A5E54385843B@sourceware.org> Date: Tue, 7 Sep 2021 17:01:17 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Sep 2021 17:01:17 -0000 https://gcc.gnu.org/g:69f11f1cf68e824d9aef7bb23d680584f40c0420 commit 69f11f1cf68e824d9aef7bb23d680584f40c0420 Author: Gaius Mulley Date: Tue Sep 7 18:00:32 2021 +0100 Fixed libm2iso cross compiler for bare metal by using CC and CFLAGS. 2021-09-06 Gaius Mulley libgm2/ChangeLog: * libgm2/configure: Rebuilt. * libgm2/configure.ac (AM_INIT_AUTOMAKE): Added no-define. * libm2iso/Makefile.am (C_INCLUDES): Added. (libm2iso_la_CFLAGS) added C_INCLUDES. (.c.lo) Use $(CC) and $(CFLAGS) instead of CC_FOR_TARGET and CFLAGS_FOR_TARGET. * libm2iso/Makefile.in: Rebuilt. Signed-off-by: Gaius Mulley Diff: --- libgm2/configure | 13 ++----------- libgm2/configure.ac | 2 +- libgm2/libm2iso/Makefile.am | 6 ++++-- libgm2/libm2iso/Makefile.in | 5 +++-- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/libgm2/configure b/libgm2/configure index ad930ce473b..8d140b2b73b 100755 --- a/libgm2/configure +++ b/libgm2/configure @@ -4531,15 +4531,6 @@ fi VERSION='version-unused' -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} @@ -12694,7 +12685,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12697 "configure" +#line 12688 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12800,7 +12791,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12803 "configure" +#line 12794 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libgm2/configure.ac b/libgm2/configure.ac index 7a81b00c9a1..83c7212d8b3 100644 --- a/libgm2/configure.ac +++ b/libgm2/configure.ac @@ -42,7 +42,7 @@ AC_CANONICAL_SYSTEM target_alias=${target_alias-$host_alias} AC_SUBST(target_alias) -AM_INIT_AUTOMAKE([1.9.3 foreign no-dist -Wall -Wno-portability]) +AM_INIT_AUTOMAKE([1.9.3 no-define foreign no-dist -Wall -Wno-portability]) AH_TEMPLATE(PACKAGE, [Name of package]) AH_TEMPLATE(VERSION, [Version number of package]) diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am index ab46b7f5632..716767a950d 100644 --- a/libgm2/libm2iso/Makefile.am +++ b/libgm2/libm2iso/Makefile.am @@ -182,9 +182,11 @@ libm2iso_la_SOURCES = $(M2MODS) \ ErrnoCategory.c wrapsock.c \ wraptime.c RTco.c +C_INCLUDES = -I.. -I$(toplevel_srcdir)/libiberty -I$(toplevel_srcdir)/include + libm2isodir = libm2iso libm2iso_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2iso_la_SOURCES))) -libm2iso_la_CFLAGS = -I. -I.. -I$(GM2_SRC)/gm2-libs-iso -I$(GM2_SRC)/gm2-libs -DBUILD_GM2_LIBS -I@srcdir@/../ -I../../../gcc -I$(GCC_DIR) -I$(GCC_DIR)/../include -I../../libgcc -I$(GCC_DIR)/../libgcc -I$(MULTIBUILDTOP)../../gcc/include +libm2iso_la_CFLAGS = $(C_INCLUDES) -I. -I.. -I$(GM2_SRC)/gm2-libs-iso -I$(GM2_SRC)/gm2-libs -DBUILD_GM2_LIBS -I@srcdir@/../ -I../../../gcc -I$(GCC_DIR) -I$(GCC_DIR)/../include -I../../libgcc -I$(GCC_DIR)/../libgcc -I$(MULTIBUILDTOP)../../gcc/include libm2iso_la_M2FLAGS = -I. -Ilibm2iso -I$(GM2_SRC)/gm2-libs-iso -I$(GM2_SRC)/gm2-libs -fiso -fextended-opaque -fm2-g -g libm2iso_la_LINK = $(LINK) -version-info $(libtool_VERSION) CLEANFILES = SYSTEM.def @@ -205,7 +207,7 @@ SYSTEM.def: Makefile $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GM2_FOR_TARGET) -c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2iso_la_M2FLAGS) $< -o $@ .c.lo: - $(LIBTOOL) --tag=CC --mode=compile $(CC_FOR_TARGET) -c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2iso_la_CFLAGS) $< -o $@ + $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $(LIBCFLAGS) $(libm2iso_la_CFLAGS) $< -o $@ install-data-local: force mkdir -p $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in index bcfca549f0d..1c952cc21e6 100644 --- a/libgm2/libm2iso/Makefile.in +++ b/libgm2/libm2iso/Makefile.in @@ -542,9 +542,10 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_ISOLIB_TRUE@ ErrnoCategory.c wrapsock.c \ @BUILD_ISOLIB_TRUE@ wraptime.c RTco.c +@BUILD_ISOLIB_TRUE@C_INCLUDES = -I.. -I$(toplevel_srcdir)/libiberty -I$(toplevel_srcdir)/include @BUILD_ISOLIB_TRUE@libm2isodir = libm2iso @BUILD_ISOLIB_TRUE@libm2iso_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2iso_la_SOURCES))) -@BUILD_ISOLIB_TRUE@libm2iso_la_CFLAGS = -I. -I.. -I$(GM2_SRC)/gm2-libs-iso -I$(GM2_SRC)/gm2-libs -DBUILD_GM2_LIBS -I@srcdir@/../ -I../../../gcc -I$(GCC_DIR) -I$(GCC_DIR)/../include -I../../libgcc -I$(GCC_DIR)/../libgcc -I$(MULTIBUILDTOP)../../gcc/include +@BUILD_ISOLIB_TRUE@libm2iso_la_CFLAGS = $(C_INCLUDES) -I. -I.. -I$(GM2_SRC)/gm2-libs-iso -I$(GM2_SRC)/gm2-libs -DBUILD_GM2_LIBS -I@srcdir@/../ -I../../../gcc -I$(GCC_DIR) -I$(GCC_DIR)/../include -I../../libgcc -I$(GCC_DIR)/../libgcc -I$(MULTIBUILDTOP)../../gcc/include @BUILD_ISOLIB_TRUE@libm2iso_la_M2FLAGS = -I. -Ilibm2iso -I$(GM2_SRC)/gm2-libs-iso -I$(GM2_SRC)/gm2-libs -fiso -fextended-opaque -fm2-g -g @BUILD_ISOLIB_TRUE@libm2iso_la_LINK = $(LINK) -version-info $(libtool_VERSION) @BUILD_ISOLIB_TRUE@CLEANFILES = SYSTEM.def @@ -884,7 +885,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_ISOLIB_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GM2_FOR_TARGET) -c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2iso_la_M2FLAGS) $< -o $@ @BUILD_ISOLIB_TRUE@.c.lo: -@BUILD_ISOLIB_TRUE@ $(LIBTOOL) --tag=CC --mode=compile $(CC_FOR_TARGET) -c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2iso_la_CFLAGS) $< -o $@ +@BUILD_ISOLIB_TRUE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $(LIBCFLAGS) $(libm2iso_la_CFLAGS) $< -o $@ @BUILD_ISOLIB_TRUE@install-data-local: force @BUILD_ISOLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR)