From: Mike Frysinger <vapier@gentoo.org>
To: newlib@sourceware.org
Subject: [PATCH 1/5] libgloss: aarch64: delete unused multi-build logic
Date: Tue, 13 Dec 2022 21:36:56 -0500 [thread overview]
Message-ID: <20221214023700.13062-2-vapier@gentoo.org> (raw)
In-Reply-To: <20221214023700.13062-1-vapier@gentoo.org>
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.
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.
None of this should be confused with the common multilib logic.
This *multi-build* which is processed in parallel.
---
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 e84aa6927a74..5d7012023dee 100644
--- a/libgloss/aarch64/Makefile.in
+++ b/libgloss/aarch64/Makefile.in
@@ -52,11 +52,8 @@ MULTISRCTOP =
MULTIBUILDTOP =
MULTIDIRS =
MULTISUBDIR =
-MULTILIBNAME =
MULTIDO = true
MULTICLEAN = true
-MULTI_FLAGS_FOR_TARGET = MULTI_DEFAULT_FLAGS
-MULTI_DEFAULT_FLAGS = -DSEMIHOST_V2
SHELL = /bin/sh
@@ -82,17 +79,15 @@ OBJS = ftruncate.o libcfunc.o syscalls.o truncate.o _exit.o _kill.o
CRT0 = crt0.o
CRT0_INSTALL = install-crt0
-RDIMON_CRT0 = rdimon-crt0${${MULTILIBNAME}}.o
-RDIMON_BSP = librdimon${${MULTILIBNAME}}.a
+RDIMON_CRT0 = rdimon-crt0.o
+RDIMON_BSP = librdimon.a
RDIMON_OBJS = $(patsubst %,rdimon-%,$(OBJS))
-RDIMON_SCRIPTS = rdimon${${MULTILIBNAME}}.specs \
- aem-ve${${MULTILIBNAME}}.specs \
- aem-validation${${MULTILIBNAME}}.specs \
- aem-v8-r${${MULTILIBNAME}}.specs
+RDIMON_SCRIPTS = rdimon.specs \
+ aem-ve.specs \
+ aem-validation.specs \
+ aem-v8-r.specs
RDIMON_INSTALL = install-rdimon
-CFLAGS = -g
-
# Host specific makefile fragment comes in here.
@host_makefile_frag@
@@ -111,7 +106,6 @@ all: ${CRT0} ${RDIMON_CRT0} ${RDIMON_BSP} ${RDIMON_SCRIPTS}
else true; fi; \
else true; fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
#
# here's where we build the test programs for each target
@@ -121,53 +115,36 @@ test:
#
crt0.o: crt0.S
- $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLUDES) -o $@ -c $<
+ $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -o $@ -c $<
-rdimon-crt0${${MULTILIBNAME}}.o: crt0.S
- $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLUDES) -DARM_RDI_MONITOR -o $@ -c $<
+rdimon-crt0.o: crt0.S
+ $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_MONITOR -o $@ -c $<
#rdimon-trap.o: trap.S
-# $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLUDES) -DARM_RDI_MONITOR -o $@ -c $<
+# $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_MONITOR -o $@ -c $<
rdimon-_exit.o: _exit.c
- $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLUDES) -DARM_RDI_MONITOR -o $@ -c $<
+ $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_MONITOR -o $@ -c $<
rdimon-ftruncate.o: ftruncate.c
- $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLUDES) -DARM_RDI_MONITOR -o $@ -c $<
+ $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_MONITOR -o $@ -c $<
rdimon-_kill.o: _kill.c
- $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLUDES) -DARM_RDI_MONITOR -o $@ -c $<
+ $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_MONITOR -o $@ -c $<
rdimon-libcfunc.o: libcfunc.c
- $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLUDES) -DARM_RDI_MONITOR -o $@ -c $<
+ $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_MONITOR -o $@ -c $<
rdimon-syscalls.o: syscalls.c
- $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLUDES) -DARM_RDI_MONITOR -o $@ -c $<
+ $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_MONITOR -o $@ -c $<
rdimon-truncate.o: truncate.c
- $(CC) $(CFLAGS_FOR_TARGET) $($(MULTI_FLAGS_FOR_TARGET)) $(CFLAGS) $(INCLUDES) -DARM_RDI_MONITOR -o $@ -c $<
+ $(CC) $(CFLAGS_FOR_TARGET) $(CFLAGS) $(INCLUDES) -DSEMIHOST_V2 -DARM_RDI_MONITOR -o $@ -c $<
$(RDIMON_BSP): $(RDIMON_OBJS)
${AR} ${ARFLAGS} $@ $^
${RANLIB} $@
-# 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=all libgloss-multi-do
-
-clean-multi:
- $(MAKE) $(AM_MAKEFLAGS) DO=clean libgloss-multi-do
-
-install-multi:
- $(MAKE) $(AM_MAKEFLAGS) DO=install libgloss-multi-do
-
clean mostlyclean:
rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) ${RDIMON_SCRIPTS}
@rootpre=`pwd`/; export rootpre; \
@@ -179,7 +156,6 @@ clean mostlyclean:
else true; fi; \
else true; fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) clean-recursive
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
install-crt0:
${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR}
@@ -220,5 +195,3 @@ Makefile: Makefile.in config.status @host_makefile_frag_path@
config.status: configure
$(SHELL) config.status --recheck
-
-include $(srcdir)/../multi-build.in
--
2.38.1
next prev parent reply other threads:[~2022-12-14 2:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-14 2:36 [PATCH 0/5] libgloss: drop custom " Mike Frysinger
2022-12-14 2:36 ` Mike Frysinger [this message]
2022-12-14 2:36 ` [PATCH 2/5] libgloss: arm: inline " Mike Frysinger
2022-12-14 2:36 ` [PATCH 3/5] libgloss: drop unused " Mike Frysinger
2022-12-14 2:36 ` [PATCH 4/5] libgloss: merge aarch64 configure script up a level Mike Frysinger
2022-12-14 2:37 ` [PATCH 5/5] libgloss: merge arm " Mike Frysinger
2022-12-19 9:17 ` [PATCH 0/5] libgloss: drop custom multi-build logic Corinna Vinschen
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=20221214023700.13062-2-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=newlib@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).