Build {g}crt0.o for each multilib

Although the code is identical, this is needed to get the
correct meta-information recorded in elf object files

Author: th-otto

Makefile

@@ -163,7 +163,7 @@ install-include-recursive install-man-recursive uninstall-lib-recursive \
 uninstall-include-recursive uninstall-man-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	echo $@ | grep -q install; \
-	if test $$? = 0 -a "${CROSS}" = yes -a "${prefix}" = "/usr"; then \
+	if test $$? = 0 -a "${CROSS}" = yes -a "$(DESTDIR)${prefix}" = "/usr"; then \
 	   echo "attempting to install on host; aborting" >&2; \
            exit 1; \
 	fi; \

buildrules

@@ -60,6 +60,7 @@ pwdgrpdir  := $(top_srcdir)/pwdgrp
 shadowdir  := $(top_srcdir)/shadow
 signaldir  := $(top_srcdir)/signal
 socketdir  := $(top_srcdir)/socket
+startupdir := $(top_srcdir)/startup
 stdiiodir  := $(top_srcdir)/stdiio
 stdiodir   := $(top_srcdir)/stdio
 stdlibdir  := $(top_srcdir)/stdlib
@@ -143,6 +144,7 @@ DEFS-xnlm_prot.c= -Wno-unused
 DEFS-xrstat.c = -Wno-unused
 DEFS-xspray.c= -Wno-unused
 
+CRT0OBJS    := crt0.o gcrt0.o
 ARGPOBJS    := $(addsuffix .o, $(basename $(notdir $(ARGPSRCS))))
 CRYPTOBJS   := $(addsuffix .o, $(basename $(notdir $(CRYPTSRCS))))
 DIRENTOBJS  := $(addsuffix .o, $(basename $(notdir $(DIRENTSRCS))))
@@ -168,7 +170,7 @@ TERMIOSOBJS := $(addsuffix .o, $(basename $(notdir $(TERMIOSSRCS))))
 TIMEOBJS    := $(addsuffix .o, $(basename $(notdir $(TIMESRCS))))
 TZOBJS      := $(addsuffix .o, $(basename $(notdir $(TZSRCS))))
 UNIXOBJS    := $(addsuffix .o, $(basename $(notdir $(UNIXSRCS))))
-OBJS := $(ARGPOBJS) $(CRYPTOBJS) $(DIRENTOBJS) $(GMPOBJS) $(LOGINOBJS) $(MINTLIBOBJS) \
+OBJS := $(CRT0OBJS) $(ARGPOBJS) $(CRYPTOBJS) $(DIRENTOBJS) $(GMPOBJS) $(LOGINOBJS) $(MINTLIBOBJS) \
   $(MISCOBJS) $(MBYTEOBJS) $(POSIXOBJS) $(PWDGRPOBJS) $(RPCSVCOBJS) $(SHADOWOBJS) \
   $(SIGNALOBJS) $(SOCKETOBJS) $(STDIIOOBJS) $(STDIOOBJS) $(STDLIBOBJS) \
   $(STRINGOBJS) $(SUNRPCOBJS) $(SYSCALLOBJS) $(SYSVIPCOBJS) $(TERMIOSOBJS) \
@@ -193,7 +195,7 @@ DEP_FILES := $(addprefix $(top_srcdir)/.deps/,$(patsubst %.o,%.P,$(OBJS)))
 
 endif  # not top_distdir.
 
-all-here: $(top_srcdir)/CFILES $(top_srcdir)/includepath $(LIBS)
+all-here: $(top_srcdir)/CFILES $(top_srcdir)/includepath $(CRT0OBJS) $(LIBS)
 
 $(top_srcdir)/includepath: $(top_srcdir)/configvars
 	@echo "Generating $@"; \
@@ -275,6 +277,12 @@ vpath %.S $(srcdirs)
 .s.o:
 	$(AM_V_CC)$(COMPILE) -Wp,-MD,$(top_srcdir)/.deps/$(@:.o=.P) -c $< -o $@
 
+crt0.o: $(startupdir)/crt0.S
+	$(AM_V_CC)$(CC) $(WARN) $(cflags) $(CFLAGS) -nostdinc -I$(top_srcdir)/include -I$(top_srcdir)/mintlib -c $< -o $@
+
+gcrt0.o: $(startupdir)/crt0.S
+	$(AM_V_CC)$(CC) $(WARN) $(cflags) $(CFLAGS) -nostdinc -I$(top_srcdir)/include -I$(top_srcdir)/mintlib -DGCRT0 -c $< -o $@
+
 # Finally, build the libs.
 $(libc): $(LIBCOBJS)
 	@rm -f $@

checkrules

@@ -15,7 +15,7 @@ type=
 # If you change this you must run "make checkclean".
 cflags=
 
-CRT0 = $(top_srcdir)/startup/crt0.o
+CRT0 = $(top_srcdir)/lib$(type)/crt0.o
 libs = $(libs-$(@F)) $(top_srcdir)/lib$(type)/libc.a
 LIBS = -lgcc $(LIBS-$(@F)) $(libs) -lgcc
 

rules

@@ -35,20 +35,24 @@ baselibs = $(basename $(LIBS))
 
 install-lib:
 	$(mkinstalldirs) $(DESTDIR)$(libdir)/$(instdir)
-	@list='$(LIBS)'; for p in $$list; do \
+	@list='$(LIBS) $(CRT0OBJS)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL) -m 644 $$p $(libdir)/$(instdir)"; \
 	    $(INSTALL) -m 644 $$p $(DESTDIR)$(libdir)/$(instdir); \
 	  else :; fi; \
 	done
 
 uninstall-lib:
-	list='$(baselibs)'; for p in $$list; do \
+	@list='$(baselibs)'; for p in $$list; do \
 	  r=$$p.a; \
 	  s="$$p"$(libsize).a; \
 	  echo " rm -f $(libdir)/$(instdir)/$$r $(libdir)/$(instdir)/$$s"; \
 	  rm -f $(DESTDIR)$(libdir)/$(instdir)/$$r $(DESTDIR)$(libdir)/$(instdir)/$$s; \
 	done
+	@list='$(CRT0OBJS)'; for p in $$list; do \
+	  echo " rm -f $(DESTDIR)$(libdir)/$(instdir)/$$p"; \
+	  rm -f $(DESTDIR)$(libdir)/$(instdir)/$$p; \
+	done
 endif
 
 check: check-recursive

startup/Makefile

@@ -20,42 +20,21 @@ dont_install_libs = yes
 include $(top_srcdir)/configvars
 include $(top_srcdir)/bindist
 
-OBJS = crt0.o gcrt0.o
-
 libdir = $(prefix)/lib
 
 INCLUDES = -nostdinc -I$(top_srcdir)/include -I$(top_srcdir)/mintlib
 
 COMPILE = $(CC) $(WARN) $(CFLAGS) $(INCLUDES) $(DEFS)
 
-all-here: $(OBJS)
+all-here:
 
 include $(top_srcdir)/phony
 
-crt0.o: $(srcdir)/crt0.S
-	$(COMPILE) $(INCLUDES) -c $< -o $@
-
-gcrt0.o: $(srcdir)/crt0.S
-	$(COMPILE) $(INCLUDES) -DGCRT0 -c $< -o $@
-
 include $(top_srcdir)/rules
 
 install: all-here
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	@list='$(OBJS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(INSTALL) -m 644 $$p $(libdir)"; \
-	    $(INSTALL) -m 644 $$p $(DESTDIR)$(libdir); \
-	  else :; fi; \
-	done
 
 uninstall:
-	@list='$(OBJS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " rm -f $(libdir)/$$p"; \
-	    rm -f $(DESTDIR)$(libdir)/$$p; \
-	  else :; fi; \
-	done
 
 install-include: