[Scummvm-git-logs] scummvm master -> cd34eaa2c5bccc5cc67e5e7105fd60279edf4df6

sev- sev at scummvm.org
Sun Jan 17 20:53:20 UTC 2021 

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
72c464bf11 ALL: Use LD instead of CXX when linking
51e174f202 ALL: Mark link commands as make recursive
cd34eaa2c5 VITA: Use make jobserver to control how many jobs linker can use


Commit: 72c464bf1143bc83f7ffb624563f13dddbb81f25
    https://github.com/scummvm/scummvm/commit/72c464bf1143bc83f7ffb624563f13dddbb81f25
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-01-17T21:53:15+01:00

Commit Message:
ALL: Use LD instead of CXX when linking

It will be more coherent.
LD is defined to CXX in configure script so it shouldn't change
behaviour.

Changed paths:
    backends/platform/ds/ds.mk
    ports.mk
    rules.mk
    test/module.mk


diff --git a/backends/platform/ds/ds.mk b/backends/platform/ds/ds.mk
index 8b104f624b..855cef72fa 100644
--- a/backends/platform/ds/ds.mk
+++ b/backends/platform/ds/ds.mk
@@ -207,7 +207,7 @@ $(ndsdir)/arm7/source/main.o: CPPFLAGS=
 $(ndsdir)/arm7/arm7.elf: \
 	$(ndsdir)/arm7/source/libcartreset/cartreset.o \
 	$(ndsdir)/arm7/source/main.o
-	$(CXX) $(ARM7_LDFLAGS) -specs=ds_arm7.specs $+ -L$(DEVKITPRO)/libnds/lib -lnds7  -o $@
+	$(LD) $(ARM7_LDFLAGS) -specs=ds_arm7.specs $+ -L$(DEVKITPRO)/libnds/lib -lnds7  -o $@
 
 
 
diff --git a/ports.mk b/ports.mk
index 7d863fc3c4..38e58ada24 100644
--- a/ports.mk
+++ b/ports.mk
@@ -470,14 +470,14 @@ endif
 # We use -force_cpusubtype_ALL to ensure the binary runs on every
 # PowerPC machine.
 scummvm-static: $(DETECT_OBJS) $(OBJS)
-	$(CXX) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(DETECT_OBJS) $(OBJS) \
+	$(LD) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(DETECT_OBJS) $(OBJS) \
 		-framework CoreMIDI \
 		$(OSX_STATIC_LIBS) \
 		$(OSX_ZLIB)
 
 # Special target to create a static linked binary for the iPhone (legacy, and iOS 7+)
 iphone: $(DETECT_OBJS) $(OBJS)
-	$(CXX) $(LDFLAGS) -o scummvm $(DETECT_OBJS) $(OBJS) \
+	$(LD) $(LDFLAGS) -o scummvm $(DETECT_OBJS) $(OBJS) \
 		$(OSX_STATIC_LIBS) \
 		-framework UIKit -framework CoreGraphics -framework OpenGLES \
 		-framework CoreFoundation -framework QuartzCore -framework Foundation \
diff --git a/rules.mk b/rules.mk
index a3bbec5977..bb27b3322e 100644
--- a/rules.mk
+++ b/rules.mk
@@ -25,7 +25,7 @@ TOOL_LIBS-$(TOOL-$(MODULE)) := $(TOOL_LIBS)
 TOOL_CFLAGS-$(TOOL-$(MODULE)) := $(TOOL_CFLAGS)
 
 $(TOOL-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(TOOL_DEPS)
-	$(QUIET_CXX)$(CXX) $(LDFLAGS) $(TOOL_CFLAGS-$@) $+ $(TOOL_LIBS-$@) -o $@
+	$(QUIET_LINK)$(LD) $(LDFLAGS) $(TOOL_CFLAGS-$@) $+ $(TOOL_LIBS-$@) -o $@
 
 # Reset TOOL_* vars
 TOOL_EXECUTABLE:=
@@ -48,7 +48,7 @@ ifdef PLUGIN
 PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX)
 $(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS)
 	$(QUIET)$(MKDIR) plugins
-	$(QUIET_PLUGIN)$(CXX) $(SAVED_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@
+	$(QUIET_PLUGIN)$(LD) $(SAVED_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@
 
 # Reset PLUGIN var
 PLUGIN:=
diff --git a/test/module.mk b/test/module.mk
index ebecc89711..5b34568e32 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -71,7 +71,7 @@ endif
 test: test/runner
 	./test/runner
 test/runner: test/runner.cpp $(TEST_LIBS) copy-dat
-	$(QUIET_CXX)$(CXX) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -o $@ test/runner.cpp $(TEST_LIBS) $(TEST_LDFLAGS)
+	$(QUIET_CXX)$(LD) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -o $@ test/runner.cpp $(TEST_LIBS) $(TEST_LDFLAGS)
 test/runner.cpp: $(TESTS)
 	@mkdir -p test
 	$(srcdir)/test/cxxtest/cxxtestgen.py $(TEST_FLAGS) -o $@ $+


Commit: 51e174f202b452925e452f5e34a07f502322e3e0
    https://github.com/scummvm/scummvm/commit/51e174f202b452925e452f5e34a07f502322e3e0
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-01-17T21:53:15+01:00

Commit Message:
ALL: Mark link commands as make recursive

With this make gives access to its jobserver for linker which will use
it when linking with -flto=jobserver

Changed paths:
    Makefile.common
    backends/platform/ds/arm7/Makefile
    backends/platform/ds/ds.mk
    backends/platform/n64/Makefile
    backends/platform/psp/Makefile
    devtools/module.mk
    ports.mk
    rules.mk
    test/module.mk


diff --git a/Makefile.common b/Makefile.common
index a88becfa77..3e2d47e006 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -123,7 +123,7 @@ endif
 
 # The build rule for the ScummVM executable
 $(EXECUTABLE): $(DETECT_OBJS) $(OBJS)
-	$(QUIET_LINK)$(LD) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
+	+$(QUIET_LINK)$(LD) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
 
 ifdef SPLIT_DWARF
 $(EXECUTABLE).dwp: $(EXECUTABLE)
diff --git a/backends/platform/ds/arm7/Makefile b/backends/platform/ds/arm7/Makefile
index 3289266df9..2c75019aed 100644
--- a/backends/platform/ds/arm7/Makefile
+++ b/backends/platform/ds/arm7/Makefile
@@ -156,7 +156,7 @@ $(OUTPUT).elf	:	$(OFILES)
 #---------------------------------------------------------------------------------
 %.elf:
 	echo ELF
-	$(LD)  $(LDFLAGS) -specs=ds_arm7.specs $(OFILES) $(LIBPATHS) $(LIBS) -o $(TARGET).elf
+	+$(LD)  $(LDFLAGS) -specs=ds_arm7.specs $(OFILES) $(LIBPATHS) $(LIBS) -o $(TARGET).elf
 
 
 
diff --git a/backends/platform/ds/ds.mk b/backends/platform/ds/ds.mk
index 855cef72fa..16cffeabde 100644
--- a/backends/platform/ds/ds.mk
+++ b/backends/platform/ds/ds.mk
@@ -207,7 +207,7 @@ $(ndsdir)/arm7/source/main.o: CPPFLAGS=
 $(ndsdir)/arm7/arm7.elf: \
 	$(ndsdir)/arm7/source/libcartreset/cartreset.o \
 	$(ndsdir)/arm7/source/main.o
-	$(LD) $(ARM7_LDFLAGS) -specs=ds_arm7.specs $+ -L$(DEVKITPRO)/libnds/lib -lnds7  -o $@
+	+$(LD) $(ARM7_LDFLAGS) -specs=ds_arm7.specs $+ -L$(DEVKITPRO)/libnds/lib -lnds7  -o $@
 
 
 
diff --git a/backends/platform/n64/Makefile b/backends/platform/n64/Makefile
index 4f3744f7e8..f7341eedd4 100644
--- a/backends/platform/n64/Makefile
+++ b/backends/platform/n64/Makefile
@@ -80,7 +80,7 @@ ROMFS.img:
 	genromfs -f ./ROMFS.img -d ./ROMFS -V romtest
 
 $(TARGET).elf: $(OBJS)
-	$(LD) -o $(TARGET).elf $(OBJS) $(LDFLAGS)
+	+$(LD) -o $(TARGET).elf $(OBJS) $(LDFLAGS)
 
 $(TARGET).bin : $(TARGET).elf
 	$(OBJCOPY) $(TARGET).elf $(TARGET).bin -O binary
diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile
index 7f4f20446e..d11c2be38a 100644
--- a/backends/platform/psp/Makefile
+++ b/backends/platform/psp/Makefile
@@ -173,7 +173,7 @@ LDFLAGS += -Wl,-T../../plugins/psp/main_prog.ld
 all: $(PSP_EBOOT)
 
 $(TARGET).elf: $(OBJS)
-	$(LD) $(PRE_OBJS_FLAGS) $(OBJS) $(POST_OBJS_FLAGS) $(LDFLAGS) $(LIBS) -o $@
+	+$(LD) $(PRE_OBJS_FLAGS) $(OBJS) $(POST_OBJS_FLAGS) $(LDFLAGS) $(LIBS) -o $@
 	cp $(TARGET).elf $(TARGET).org.elf
 	$(FIXUP) $@
 
diff --git a/devtools/module.mk b/devtools/module.mk
index eea319881a..d5c7d65400 100644
--- a/devtools/module.mk
+++ b/devtools/module.mk
@@ -34,15 +34,15 @@ clean-devtools:
 
 devtools/convbdf$(EXEEXT): $(srcdir)/devtools/convbdf.cpp
 	$(QUIET)$(MKDIR) devtools/$(DEPDIR)
-	$(QUIET_LINK)$(LD) $(CXXFLAGS) -Wall -o $@ $<
+	+$(QUIET_LINK)$(LD) $(CXXFLAGS) -Wall -o $@ $<
 
 devtools/md5table$(EXEEXT): $(srcdir)/devtools/md5table.c
 	$(QUIET)$(MKDIR) devtools/$(DEPDIR)
-	$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
+	+$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
 
 devtools/make-scumm-fontdata$(EXEEXT): $(srcdir)/devtools/make-scumm-fontdata.c
 	$(QUIET)$(MKDIR) devtools/$(DEPDIR)
-	$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
+	+$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
 
 # Rule to explicitly rebuild the wwwroot archive
 wwwroot:
diff --git a/ports.mk b/ports.mk
index 38e58ada24..8be0d435cf 100644
--- a/ports.mk
+++ b/ports.mk
@@ -470,14 +470,14 @@ endif
 # We use -force_cpusubtype_ALL to ensure the binary runs on every
 # PowerPC machine.
 scummvm-static: $(DETECT_OBJS) $(OBJS)
-	$(LD) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(DETECT_OBJS) $(OBJS) \
+	+$(LD) $(LDFLAGS) -force_cpusubtype_ALL -o scummvm-static $(DETECT_OBJS) $(OBJS) \
 		-framework CoreMIDI \
 		$(OSX_STATIC_LIBS) \
 		$(OSX_ZLIB)
 
 # Special target to create a static linked binary for the iPhone (legacy, and iOS 7+)
 iphone: $(DETECT_OBJS) $(OBJS)
-	$(LD) $(LDFLAGS) -o scummvm $(DETECT_OBJS) $(OBJS) \
+	+$(LD) $(LDFLAGS) -o scummvm $(DETECT_OBJS) $(OBJS) \
 		$(OSX_STATIC_LIBS) \
 		-framework UIKit -framework CoreGraphics -framework OpenGLES \
 		-framework CoreFoundation -framework QuartzCore -framework Foundation \
diff --git a/rules.mk b/rules.mk
index bb27b3322e..88819554fe 100644
--- a/rules.mk
+++ b/rules.mk
@@ -25,7 +25,7 @@ TOOL_LIBS-$(TOOL-$(MODULE)) := $(TOOL_LIBS)
 TOOL_CFLAGS-$(TOOL-$(MODULE)) := $(TOOL_CFLAGS)
 
 $(TOOL-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(TOOL_DEPS)
-	$(QUIET_LINK)$(LD) $(LDFLAGS) $(TOOL_CFLAGS-$@) $+ $(TOOL_LIBS-$@) -o $@
+	+$(QUIET_LINK)$(LD) $(LDFLAGS) $(TOOL_CFLAGS-$@) $+ $(TOOL_LIBS-$@) -o $@
 
 # Reset TOOL_* vars
 TOOL_EXECUTABLE:=
@@ -48,7 +48,7 @@ ifdef PLUGIN
 PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX)
 $(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS)
 	$(QUIET)$(MKDIR) plugins
-	$(QUIET_PLUGIN)$(LD) $(SAVED_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@
+	+$(QUIET_PLUGIN)$(LD) $(SAVED_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@
 
 # Reset PLUGIN var
 PLUGIN:=
diff --git a/test/module.mk b/test/module.mk
index 5b34568e32..192e336dbc 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -71,7 +71,7 @@ endif
 test: test/runner
 	./test/runner
 test/runner: test/runner.cpp $(TEST_LIBS) copy-dat
-	$(QUIET_CXX)$(LD) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -o $@ test/runner.cpp $(TEST_LIBS) $(TEST_LDFLAGS)
+	+$(QUIET_CXX)$(LD) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -o $@ test/runner.cpp $(TEST_LIBS) $(TEST_LDFLAGS)
 test/runner.cpp: $(TESTS)
 	@mkdir -p test
 	$(srcdir)/test/cxxtest/cxxtestgen.py $(TEST_FLAGS) -o $@ $+


Commit: cd34eaa2c5bccc5cc67e5e7105fd60279edf4df6
    https://github.com/scummvm/scummvm/commit/cd34eaa2c5bccc5cc67e5e7105fd60279edf4df6
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-01-17T21:53:15+01:00

Commit Message:
VITA: Use make jobserver to control how many jobs linker can use

-flto=jobserver is present in GCC since version 7 at least

Changed paths:
    configure


diff --git a/configure b/configure
index 2a3d06f52e..1c11c962d4 100755
--- a/configure
+++ b/configure
@@ -3145,8 +3145,8 @@ EOF
 		append_var CXXFLAGS "-mword-relocations"
 		append_var CXXFLAGS "-fomit-frame-pointer"
 		#use link time optimization to further reduce exe size
-		append_var CXXFLAGS "-flto=20"
-		append_var LDFLAGS "-flto=20"
+		append_var CXXFLAGS "-flto"
+		append_var LDFLAGS "-flto=jobserver"
 		#ensure verbose output during linking to prevent buildbot kills after 1200 seconds
 		if test "$_verbose_build" = yes ; then
 			append_var LDFLAGS "-Wl,-v --verbose"

More information about the Scummvm-git-logs mailing list