From 033e7928b5628b4bf288439a3923a848a3409b37 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Sat, 19 Aug 2006 13:05:16 +0200
Subject: [PATCH] Minor Makefile updates.

---
 .hgignore                                       |  2 +-
 src/stub/Makefile                               | 17 +++++++++--------
 .../src/arch/mips/mipsel.r3000/Makefile.extra   |  3 +--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.hgignore b/.hgignore
index fab9cfb6..79ca7012 100644
--- a/.hgignore
+++ b/.hgignore
@@ -35,7 +35,7 @@ src/compress_nrv*
 src/*.rc
 
 stub/**MMakefile
-stub/**.*stamp
+stub/**.*-stamp
 stub/tmp*
 stub/**/tmp*
 
diff --git a/src/stub/Makefile b/src/stub/Makefile
index ed4b1079..d75c3396 100644
--- a/src/stub/Makefile
+++ b/src/stub/Makefile
@@ -92,15 +92,16 @@ default: $$(default.targets)
 endif
 endif
 
-all.targets ?= upx-stubtools-check-version tmp/.tmp-stamp .all-stamp
+all.targets ?= .upx-stubtools-stamp tmp/.tmp-stamp .all-stamp
 all: $$(all.targets)
 tmp/.tmp-stamp:
 	@mkdir -p $(dir $@)
 	@echo "timestamp" > $@
 .all-stamp: $$(STUBS)
 	@echo "timestamp" > $@
-upx-stubtools-check-version:
-	@upx-stubtools-check-version 20060816
+.upx-stubtools-stamp: $(MAKEFILE_LIST)
+	upx-stubtools-check-version 20060816
+	@echo "timestamp" > $@
 
 ifeq ($(wildcard .all-stamp),)
 mostlyclean clean: distclean
@@ -115,7 +116,6 @@ maintainer-clean:
 	rm -rf tmp
 
 .PHONY: default all mostlyclean clean distclean maintainer-clean
-.PHONY: upx-stubtools-check-version
 
 
 # util var for use in the rules - basename of the current target
@@ -639,8 +639,9 @@ m68k-atari.tos-nrv2%.small.h : IDENT_SUFFIX = _small
 mipsel.r3000-ps1.h : tc_list = mipsel.r3000-ps1 default
 mipsel.r3000-ps1.h : tc_bfdname = elf32-littlemips
 
-tc.mipsel.r3000-ps1.as   = mipsel-elf-as-20060406 -O2 -mno-pdr
-tc.mipsel.r3000-ps1.gcc  = mipsel-linux-gcc-4.1.1 -march=r3000 -G0 -nostdinc -MMD -MT $@
+tc.mipsel.r3000-ps1.as   = mipsel-elf-as-20060406 -O -mno-pdr
+##tc.mipsel.r3000-ps1.as   = mipsel-linux-as-2.16.1 -O -mno-pdr
+tc.mipsel.r3000-ps1.gcc  = mipsel-linux-gcc-4.1.1 -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD -MT $@
 tc.mipsel.r3000-ps1.gcc += -fno-exceptions -fno-asynchronous-unwind-tables
 tc.mipsel.r3000-ps1.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror
 
@@ -650,8 +651,8 @@ ifeq (1,1)
 	$(call tc,as) tmp/$T.tmp1 -o tmp/$T.bin
 	$(call tc,gpp_mkdep) --mode=c --MMD=$@ $< --MF=tmp/$T.d
 else
-	## FIXME - this does not work ???
-	$(call tc,gcc) -c $(PP_FLAGS) -Wa,-O2 -Wa,-mno-pdr $< -o tmp/$T.bin
+	## FIXME - as-2.16.1 does not work ???
+	$(call tc,gcc) -c $(PP_FLAGS) -Wa,-O,-mno-pdr $< -o tmp/$T.bin
 endif
 	$(call tc,embed_objinfo,tmp/$T.bin)
 	$(call tc,bin2h) --ident=$(IDENT_NAME) tmp/$T.bin $@
diff --git a/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra b/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra
index 1f485a3d..214165b5 100644
--- a/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra
+++ b/src/stub/src/arch/mips/mipsel.r3000/Makefile.extra
@@ -27,9 +27,8 @@ lzma_d_c%.S : tc_list = mipsel-lzma mipsel.r3000-ps1 default
 lzma_d_c%.S : tc_bfdname = elf32-littlemips
 
 tc.mipsel-lzma.gcc      = $(tc.mipsel.r3000-ps1.gcc)
-tc.mipsel-lzma.gcc     += -pie
+tc.mipsel-lzma.gcc     += -pie -fPIC
 tc.mipsel-lzma.gcc     += -Os -fomit-frame-pointer
-tc.mipsel-lzma.gcc     += -fPIC -mabi=eabi -mno-abicalls
 tc.mipsel-lzma.gcc     += -ffunction-sections
 tc.mipsel-lzma.gcc     += -I$(UPX_LZMADIR)
 tc.mipsel-lzma.gcc     += -I$(top_srcdir)/src