libgloss: aarch64: delete unused multi-build logic
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.
This commit is contained in:
parent
57a08d6b9a
commit
171d6fc1dc
|
@ -52,11 +52,8 @@ MULTISRCTOP =
|
||||||
MULTIBUILDTOP =
|
MULTIBUILDTOP =
|
||||||
MULTIDIRS =
|
MULTIDIRS =
|
||||||
MULTISUBDIR =
|
MULTISUBDIR =
|
||||||
MULTILIBNAME =
|
|
||||||
MULTIDO = true
|
MULTIDO = true
|
||||||
MULTICLEAN = true
|
MULTICLEAN = true
|
||||||
MULTI_FLAGS_FOR_TARGET = MULTI_DEFAULT_FLAGS
|
|
||||||
MULTI_DEFAULT_FLAGS = -DSEMIHOST_V2
|
|
||||||
|
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
|
|
||||||
|
@ -82,17 +79,15 @@ OBJS = ftruncate.o libcfunc.o syscalls.o truncate.o _exit.o _kill.o
|
||||||
CRT0 = crt0.o
|
CRT0 = crt0.o
|
||||||
CRT0_INSTALL = install-crt0
|
CRT0_INSTALL = install-crt0
|
||||||
|
|
||||||
RDIMON_CRT0 = rdimon-crt0${${MULTILIBNAME}}.o
|
RDIMON_CRT0 = rdimon-crt0.o
|
||||||
RDIMON_BSP = librdimon${${MULTILIBNAME}}.a
|
RDIMON_BSP = librdimon.a
|
||||||
RDIMON_OBJS = $(patsubst %,rdimon-%,$(OBJS))
|
RDIMON_OBJS = $(patsubst %,rdimon-%,$(OBJS))
|
||||||
RDIMON_SCRIPTS = rdimon${${MULTILIBNAME}}.specs \
|
RDIMON_SCRIPTS = rdimon.specs \
|
||||||
aem-ve${${MULTILIBNAME}}.specs \
|
aem-ve.specs \
|
||||||
aem-validation${${MULTILIBNAME}}.specs \
|
aem-validation.specs \
|
||||||
aem-v8-r${${MULTILIBNAME}}.specs
|
aem-v8-r.specs
|
||||||
RDIMON_INSTALL = install-rdimon
|
RDIMON_INSTALL = install-rdimon
|
||||||
|
|
||||||
CFLAGS = -g
|
|
||||||
|
|
||||||
# Host specific makefile fragment comes in here.
|
# Host specific makefile fragment comes in here.
|
||||||
@host_makefile_frag@
|
@host_makefile_frag@
|
||||||
|
|
||||||
|
@ -111,7 +106,6 @@ all: ${CRT0} ${RDIMON_CRT0} ${RDIMON_BSP} ${RDIMON_SCRIPTS}
|
||||||
else true; fi; \
|
else true; fi; \
|
||||||
else true; fi; \
|
else true; fi; \
|
||||||
done
|
done
|
||||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# here's where we build the test programs for each target
|
# here's where we build the test programs for each target
|
||||||
|
@ -121,53 +115,36 @@ test:
|
||||||
|
|
||||||
#
|
#
|
||||||
crt0.o: crt0.S
|
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
|
rdimon-crt0.o: crt0.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-trap.o: trap.S
|
#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
|
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
|
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
|
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
|
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
|
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
|
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)
|
$(RDIMON_BSP): $(RDIMON_OBJS)
|
||||||
${AR} ${ARFLAGS} $@ $^
|
${AR} ${ARFLAGS} $@ $^
|
||||||
${RANLIB} $@
|
${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:
|
clean mostlyclean:
|
||||||
rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) ${RDIMON_SCRIPTS}
|
rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) ${RDIMON_SCRIPTS}
|
||||||
@rootpre=`pwd`/; export rootpre; \
|
@rootpre=`pwd`/; export rootpre; \
|
||||||
|
@ -179,7 +156,6 @@ clean mostlyclean:
|
||||||
else true; fi; \
|
else true; fi; \
|
||||||
else true; fi; \
|
else true; fi; \
|
||||||
done
|
done
|
||||||
$(MAKE) $(AM_MAKEFLAGS) clean-recursive
|
|
||||||
|
|
||||||
distclean maintainer-clean realclean: clean
|
distclean maintainer-clean realclean: clean
|
||||||
rm -f Makefile config.status *~
|
rm -f Makefile config.status *~
|
||||||
|
@ -195,7 +171,6 @@ install: ${CRT0_INSTALL} ${RDIMON_INSTALL}
|
||||||
else true; fi; \
|
else true; fi; \
|
||||||
else true; fi; \
|
else true; fi; \
|
||||||
done
|
done
|
||||||
$(MAKE) $(AM_MAKEFLAGS) install-recursive
|
|
||||||
|
|
||||||
install-crt0:
|
install-crt0:
|
||||||
${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR}
|
${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR}
|
||||||
|
@ -220,5 +195,3 @@ Makefile: Makefile.in config.status @host_makefile_frag_path@
|
||||||
|
|
||||||
config.status: configure
|
config.status: configure
|
||||||
$(SHELL) config.status --recheck
|
$(SHELL) config.status --recheck
|
||||||
|
|
||||||
include $(srcdir)/../multi-build.in
|
|
||||||
|
|
Loading…
Reference in New Issue