merge

Author: ml1050

src/Makefile

@@ -49,7 +49,7 @@ exeext ?= .out
 libext ?= .a
 objext ?= .o
 
-upx_SOURCES := $(wildcard $(srcdir)/*.cpp)
+upx_SOURCES := $(sort $(wildcard $(srcdir)/*.cpp))
 upx_OBJECTS := $(notdir $(upx_SOURCES:.cpp=$(objext)))
 
 # we need UCL and zlib - you can set envvar UPX_UCLDIR
@@ -77,7 +77,7 @@ upx$(exeext): $(upx_OBJECTS) $(upx_DEPENDENCIES)
 %.o : %.cpp | .depend
 	$(strip $(CXX) $(call e,CPPFLAGS) $(call e,CXXFLAGS) -o $@ -c $<)
 
-.depend: $(wildcard $(srcdir)/*.cpp $(srcdir)/*.h) $(MAKEFILE_LIST)
+.depend: $(sort $(wildcard $(srcdir)/*.cpp $(srcdir)/*.h)) $(MAKEFILE_LIST)
 	@rm -f $@
 ifeq ($(USE_GNUC),1)
 	@echo "Updating $@"

src/filter/ppcbxx.h

@@ -108,6 +108,7 @@ static int F(Filter *f)
     f->calls = calls;
     f->noncalls = noncalls;
     f->lastcall = lastcall;
+    ACC_UNUSED(lastnoncall);
 
 #if 0 || defined(TESTING)
     printf("\ncalls=%d noncalls=%d text_size=%x calltrickoffset=%x\n",

src/p_lx_elf.cpp

@@ -828,11 +828,13 @@ PackLinuxElf64amd::defineSymbols(Filter const *)
     adrc = page_mask & (~page_mask + adrc);  // round up to page boundary
 
     //linker->defineSymbol("ADRX", adrx); // compressed input for eXpansion
+    ACC_UNUSED(adrx);
 
     // For actual moving, we need the true count, which depends on sz_pack2
     // and is not yet known.  So the runtime stub detects "no move"
     // if adrm==adrc, and otherwise uses actual sz_pack2 to compute cntc.
     //linker->defineSymbol("CNTC", cntc);  // count  for copy
+    ACC_UNUSED(cntc);
 
     linker->defineSymbol("LENU", lenu);  // len  for unmap
     linker->defineSymbol("ADRC", adrc);  // addr for copy
@@ -2109,6 +2111,7 @@ void PackLinuxElf32::ARM_defineSymbols(Filter const * /*ft*/)
     linker->defineSymbol("LENF", 4+ linker->getSymbolOffset("end_decompress"));
 
     linker->defineSymbol("ADRM", adrm);  // addr for map
+    ACC_UNUSED(adrx);
 }
 
 void PackLinuxElf32armLe::defineSymbols(Filter const *ft)
@@ -2183,6 +2186,7 @@ void PackLinuxElf32mipseb::defineSymbols(Filter const * /*ft*/)
     // and is not yet known.  So the runtime stub detects "no move"
     // if adrm==adrc, and otherwise uses actual sz_pack2 to compute cntc.
     //linker->defineSymbol("CNTC", cntc);  // count  for copy
+    ACC_UNUSED(cntc);
 
     linker->defineSymbol("ADRC", adrc);  // addr for copy
     linker->defineSymbol("LENU", lenu);  // len  for unmap
@@ -2255,6 +2259,7 @@ void PackLinuxElf32mipsel::defineSymbols(Filter const * /*ft*/)
     // and is not yet known.  So the runtime stub detects "no move"
     // if adrm==adrc, and otherwise uses actual sz_pack2 to compute cntc.
     //linker->defineSymbol("CNTC", cntc);  // count  for copy
+    ACC_UNUSED(cntc);
 
     linker->defineSymbol("ADRC", adrc);  // addr for copy
     linker->defineSymbol("LENU", lenu);  // len  for unmap

src/stub/Makefile

@@ -1261,7 +1261,9 @@ endif
 ifndef EXTRA_MAKEFILES
 EXTRA_MAKEFILES :=
 ##ifneq ($(filter extra-%,$(MAKECMDGOALS)),)
-EXTRA_MAKEFILES += $(wildcard src/arch/*/Makefile.extra src/arch/*/*/Makefile.extra src/arch/*/*/*/Makefile.extra)
+EXTRA_MAKEFILES += $(sort $(wildcard src/arch/*/Makefile.extra))
+EXTRA_MAKEFILES += $(sort $(wildcard src/arch/*/*/Makefile.extra))
+EXTRA_MAKEFILES += $(sort $(wildcard src/arch/*/*/*/Makefile.extra))
 ####EXTRA_MAKEFILES += $(shell find src/arch -name Makefile.extra 2>/dev/null)
 ##endif
 endif