[NP] Introduce axrt.specs and clean up linklibs

Author: deadwood

config/make.tmpl

@@ -1064,11 +1064,10 @@ endif
 )
 
 %(prog) : OBJDIR := %(objdir)
-%(prog) : OBJS := %(objs) $(%(mmake)-link_DEPLIBS) $(TOOLDIR)/runtime.ld
-%(prog) : LDFLAGS := $(strip %(ldflags) $(%(mmake)-link_EXTRA_LDFLAGS)) -Wl,-rpath,'$$ORIGIN'
+%(prog) : OBJS := %(objs) $(%(mmake)-link_DEPLIBS) $(AROS_LIB)/axrt.ld
+%(prog) : LDFLAGS := $(strip %(ldflags) $(%(mmake)-link_EXTRA_LDFLAGS)) -specs=$(AROS_LIB)/axrt.specs
 %(prog) : LIBS := $(addprefix -l,%(uselibs) $(%(mmake)-link_EXTRA_LIBS) %(usehostlibs)) \
--L$(AROS_LIB) -lautoinit -lmui -larossupport -lamiga -lstdc.static -lstdc -lcodesets -lkeymap -lexpansion -lcommodities -ldiskfont -lasl -lmuimaster -ldatatypes -lcybergraphics -lworkbench -licon -lintuition -lgadtools -llayers -laros -lpartition -liffparse -lgraphics -llocale -ldos -lutility -loop -lexec -lautoinit -lamiga -llibinit -lm \
--laxrt
+-L$(AROS_LIB) -lmui -lstdc.static -lstdc -lcodesets -lkeymap -lexpansion -lcommodities -ldiskfont -lasl -lmuimaster -ldatatypes -lcybergraphics -lworkbench -licon -lintuition -lgadtools -llayers -laros -lpartition -liffparse -lgraphics -llocale -ldos -lutility -loop -lm
 %(prog) : %(objs) $(%(mmake)-link_DEPLIBS)
 	%link_q cmd="%(cmd)" strip="%(strip)" from=$(OBJS) opt=$(LDFLAGS) libs=$(LIBS) objdir=$(OBJDIR) coverageinstr=%(coverageinstr)
 
@@ -1113,11 +1112,10 @@ endif
 %(mmake)-link_PROGS := $(addprefix %(targetdir)/,%(progs))
 
 $(%(mmake)-link_PROGS) : OBJDIR := %(objdir)
-$(%(mmake)-link_PROGS) : LDFLAGS := $(strip %(ldflags) $(%(mmake)-link_EXTRA_LDFLAGS)) -Wl,-rpath,'$$ORIGIN'
+$(%(mmake)-link_PROGS) : LDFLAGS := $(strip %(ldflags) $(%(mmake)-link_EXTRA_LDFLAGS)) -specs=$(AROS_LIB)/axrt.specs
 $(%(mmake)-link_PROGS) : LIBS := $(addprefix -l,%(uselibs) $(%(mmake)-link_EXTRA_LIBS) %(usehostlibs)) \
--L$(AROS_LIB) -lautoinit -lmui -larossupport -lamiga -lstdc.static -lstdc -lcodesets -lkeymap -lexpansion -lcommodities -ldiskfont -lasl -lmuimaster -ldatatypes -lcybergraphics -lworkbench -licon -lintuition -lgadtools -llayers -laros -lpartition -liffparse -lgraphics -llocale -ldos -lutility -loop -lexec -lautoinit -lamiga -llibinit -lm \
--laxrt
-$(%(mmake)-link_PROGS) : %(targetdir)/% : %(objdir)/%.o $(%(mmake)-link_DEPLIBS) $(TOOLDIR)/runtime.ld
+-L$(AROS_LIB) -lmui -lstdc.static -lstdc -lcodesets -lkeymap -lexpansion -lcommodities -ldiskfont -lasl -lmuimaster -ldatatypes -lcybergraphics -lworkbench -licon -lintuition -lgadtools -llayers -laros -lpartition -liffparse -lgraphics -llocale -ldos -lutility -loop -lm
+$(%(mmake)-link_PROGS) : %(targetdir)/% : %(objdir)/%.o $(%(mmake)-link_DEPLIBS) $(AROS_LIB)/axrt.ld
 	%link_q cmd="%(cmd)" strip="%(strip)" from=$< opt=$(LDFLAGS) libs=$(LIBS) objdir=$(OBJDIR) coverageinstr=%(coverageinstr)
 %end
 #------------------------------------------------------------------------------
@@ -1173,10 +1171,10 @@ endif
 %(module) : ENDTAG := %(endobj)
 %(module) : ERR := %(err)
 %(module) : OBJDIR := %(objdir)
-%(module) : LDFLAGS := $(%(mmake)_LDFLAGS) -shared -Wl,--unresolved-symbols=ignore-in-shared-libs
+%(module) : LDFLAGS := $(%(mmake)_LDFLAGS) -shared -Wl,--unresolved-symbols=ignore-in-shared-libs -specs=$(AROS_LIB)/axrt.specs -noaxrtloader
 ifeq (%(usehostlibs),)
 %(module) : LIBS := $(addprefix -l,$(LIB_NAMES)) \
--L$(AROS_LIB) -lautoinit -lmui -larossupport -lamiga -lstdc.static -lstdc -lcodesets -lkeymap -lexpansion -lcommodities -ldiskfont -lasl -lmuimaster -ldatatypes -lcybergraphics -lworkbench -licon -lintuition -lgadtools -llayers -laros -lpartition -liffparse -lgraphics -llocale -ldos -lutility -loop -lexec -lautoinit -lamiga -llibinit -lm
+-L$(AROS_LIB) -lmui -lstdc.static -lstdc -lcodesets -lkeymap -lexpansion -lcommodities -ldiskfont -lasl -lmuimaster -ldatatypes -lcybergraphics -lworkbench -licon -lintuition -lgadtools -llayers -laros -lpartition -liffparse -lgraphics -llocale -ldos -lutility -loop -lm
 else
 # Warning: the -L/usr/lib here can result in modules
 # linking against host libs instead of AROS libs (e.g stdc++) !!
@@ -2401,7 +2399,7 @@ endif
 
 ifeq (%(build_library),M)
 # The module is linked from all the compiled .o files
-%rule_linkmodule module=$(%(mmake)%(flavour)_MODULE) objs="$(%(mmake)%(flavour)_STARTOBJS) $(%(mmake)%(flavour)_OBJS) $(USER_OBJS) $(TOOLDIR)/runtime.ld" \
+%rule_linkmodule module=$(%(mmake)%(flavour)_MODULE) objs="$(%(mmake)%(flavour)_STARTOBJS) $(%(mmake)%(flavour)_OBJS) $(USER_OBJS) $(AROS_LIB)/axrt.ld" \
 		 endobj=$(%(mmake)%(flavour)_ENDOBJS) err=$(%(mmake)%(flavour)_ERR) objdir="$(%(mmake)%(flavour)_OBJDIR)" \
 		 cmd=$(%(mmake)%(flavour)_LINK) ldflags="$(LDFLAGS) $($(%(mmake)%(flavour)_DEFNAME)_LDFLAGS)" \
 		 uselibs="$(%(mmake)%(flavour)_LIBS) $($(%(mmake)%(flavour)_DEFNAME)_LIBS)" usehostlibs="%(usehostlibs)"