From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 91B7F3858D1E; Mon, 19 Dec 2022 23:59:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 91B7F3858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671494373; bh=y8vdX66TVRW8q2NmXH2uf8OpKzQswuSAV4nyxJ7JZiE=; h=From:To:Subject:Date:From; b=uEHWCjLp4o5DQWh5AyH7IL0TGTl3ZaHAbnWwp9F37AUPXgQSMtgWr875PuhhE5tLQ uIepJIyWyihNwt1P/3IsTY3M45C3giMB84vjzcAJcyl+TOhz3+CN6GXr+DCbqo0ta/ r3BUrSFiHbzzG/0tpdJ4Hd0ItZ9/izRnhP+89i2k= 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: aarch64: delete unused multi-build logic X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 57a08d6b9a01ed56ff80905d0b3cb30fe217f1d3 X-Git-Newrev: 171d6fc1dcaf2aadd2fbe33b3a452a7b274f4e73 Message-Id: <20221219235933.91B7F3858D1E@sourceware.org> Date: Mon, 19 Dec 2022 23:59:33 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D171d6fc1dca= f2aadd2fbe33b3a452a7b274f4e73 commit 171d6fc1dcaf2aadd2fbe33b3a452a7b274f4e73 Author: Mike Frysinger Date: Tue Dec 13 21:04:48 2022 -0500 libgloss: aarch64: delete unused multi-build logic =20 This logic looks like it was copied from the arm port, but it isn't actually used here. Since no other port uses this custom libgloss multi-build.in logic, and it's making things difficult to unify, and aarch64 isn't even using it, drop it all. The set of installed objects and their content should be the same. =20 Once we move this to unified automake, if we want to readd support for subdir multi-builds, it'll be a lot easier as we can just add another set of objects with custom flags. =20 None of this should be confused with the common multilib logic. This *multi-build* which is processed in parallel. Diff: --- libgloss/aarch64/Makefile.in | 59 ++++++++++++----------------------------= ---- 1 file changed, 16 insertions(+), 43 deletions(-) diff --git a/libgloss/aarch64/Makefile.in b/libgloss/aarch64/Makefile.in index e84aa6927..5d7012023 100644 --- a/libgloss/aarch64/Makefile.in +++ b/libgloss/aarch64/Makefile.in @@ -52,11 +52,8 @@ MULTISRCTOP =3D MULTIBUILDTOP =3D MULTIDIRS =3D MULTISUBDIR =3D -MULTILIBNAME =3D MULTIDO =3D true MULTICLEAN =3D true -MULTI_FLAGS_FOR_TARGET =3D MULTI_DEFAULT_FLAGS -MULTI_DEFAULT_FLAGS =3D -DSEMIHOST_V2 =20 SHELL =3D /bin/sh =20 @@ -82,17 +79,15 @@ OBJS =3D ftruncate.o libcfunc.o syscalls.o truncate.o _= exit.o _kill.o CRT0 =3D crt0.o CRT0_INSTALL =3D install-crt0 =20 -RDIMON_CRT0 =3D rdimon-crt0${${MULTILIBNAME}}.o -RDIMON_BSP =3D librdimon${${MULTILIBNAME}}.a +RDIMON_CRT0 =3D rdimon-crt0.o +RDIMON_BSP =3D librdimon.a RDIMON_OBJS =3D $(patsubst %,rdimon-%,$(OBJS)) -RDIMON_SCRIPTS =3D rdimon${${MULTILIBNAME}}.specs \ - aem-ve${${MULTILIBNAME}}.specs \ - aem-validation${${MULTILIBNAME}}.specs \ - aem-v8-r${${MULTILIBNAME}}.specs +RDIMON_SCRIPTS =3D rdimon.specs \ + aem-ve.specs \ + aem-validation.specs \ + aem-v8-r.specs RDIMON_INSTALL =3D install-rdimon =20 -CFLAGS =3D -g - # Host specific makefile fragment comes in here. @host_makefile_frag@ =20 @@ -111,7 +106,6 @@ all: ${CRT0} ${RDIMON_CRT0} ${RDIMON_BSP} ${RDIMON_SCRI= PTS} else true; fi; \ else true; fi; \ done - $(MAKE) $(AM_MAKEFLAGS) all-recursive =20 # # here's where we build the test programs for each target @@ -121,53 +115,36 @@ test: =20 # crt0.o: crt0.S - $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLU= DES) -o $@ -c $< + $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -o $@ -c $< =20 -rdimon-crt0${${MULTILIBNAME}}.o: crt0.S - $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLU= DES) -DARM_RDI_MONITOR -o $@ -c $< +rdimon-crt0.o: crt0.S + $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_= MONITOR -o $@ -c $< =20 #rdimon-trap.o: trap.S -# $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCL= UDES) -DARM_RDI_MONITOR -o $@ -c $< +# $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI= _MONITOR -o $@ -c $< =20 rdimon-_exit.o: _exit.c - $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLU= DES) -DARM_RDI_MONITOR -o $@ -c $< + $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_= MONITOR -o $@ -c $< =20 rdimon-ftruncate.o: ftruncate.c - $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLU= DES) -DARM_RDI_MONITOR -o $@ -c $< + $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_= MONITOR -o $@ -c $< =20 rdimon-_kill.o: _kill.c - $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLU= DES) -DARM_RDI_MONITOR -o $@ -c $< + $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_= MONITOR -o $@ -c $< =20 rdimon-libcfunc.o: libcfunc.c - $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLU= DES) -DARM_RDI_MONITOR -o $@ -c $< + $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_= MONITOR -o $@ -c $< =20 rdimon-syscalls.o: syscalls.c - $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLU= DES) -DARM_RDI_MONITOR -o $@ -c $< + $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_= MONITOR -o $@ -c $< =20 rdimon-truncate.o: truncate.c - $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLU= DES) -DARM_RDI_MONITOR -o $@ -c $< + $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_= MONITOR -o $@ -c $< =20 $(RDIMON_BSP): $(RDIMON_OBJS) ${AR} ${ARFLAGS} $@ $^ ${RANLIB} $@ =20 -# Multilib support. -.PHONY: libgloss-multi-do all-multi clean-multi install-multi - -all-recursive: all-multi -clean-recursive: clean-multi -install-recursive: install-multi - -# The $(MAKE) comments below are to enable parallel building. -all-multi: - $(MAKE) $(AM_MAKEFLAGS) DO=3Dall libgloss-multi-do - -clean-multi: - $(MAKE) $(AM_MAKEFLAGS) DO=3Dclean libgloss-multi-do - -install-multi: - $(MAKE) $(AM_MAKEFLAGS) DO=3Dinstall libgloss-multi-do - clean mostlyclean: rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) ${RDIMON_SCRI= PTS} @rootpre=3D`pwd`/; export rootpre; \ @@ -179,7 +156,6 @@ clean mostlyclean: else true; fi; \ else true; fi; \ done - $(MAKE) $(AM_MAKEFLAGS) clean-recursive =20 distclean maintainer-clean realclean: clean rm -f Makefile config.status *~ @@ -195,7 +171,6 @@ install: ${CRT0_INSTALL} ${RDIMON_INSTALL} else true; fi; \ else true; fi; \ done - $(MAKE) $(AM_MAKEFLAGS) install-recursive =20 install-crt0: ${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR} @@ -220,5 +195,3 @@ Makefile: Makefile.in config.status @host_makefile_frag= _path@ =20 config.status: configure $(SHELL) config.status --recheck - -include $(srcdir)/../multi-build.in