diff -Nru paxtest-0.9.5/Makefile paxtest-0.9.5.1/Makefile
--- paxtest-0.9.5/Makefile	2003-11-04 16:39:39.000000000 -0500
+++ paxtest-0.9.5.1/Makefile	2003-11-10 18:19:47.000000000 -0500
@@ -22,5 +22,5 @@
 	make -f Makefile.generic
 
 clean:
-	make -f Makefile.Adamantix clean
+	make -f Makefile.generic clean
 
diff -Nru paxtest-0.9.5/Makefile.Gentoo-hardened paxtest-0.9.5.1/Makefile.Gentoo-hardened
--- paxtest-0.9.5/Makefile.Gentoo-hardened	2003-11-04 05:47:37.000000000 -0500
+++ paxtest-0.9.5.1/Makefile.Gentoo-hardened	2003-11-10 18:20:17.000000000 -0500
@@ -1,19 +1,18 @@
 #!/usr/bin/make
 
-CC=gcc
-CFLAGS=-O2
-LDFLAGS=
+GCC_SPCS:=$(shell gcc -dumpspecs > dumpspecs)
+CC := gcc -specs=dumpspecs
+
+CFLAGS  := -O2
+LDFLAGS :=
 ifndef RUNDIR
-RUNDIR=.
+RUNDIR := /usr/lib/paxtest
 endif
 
 # The Hardened GCC compiler has stack protector on by default, this
 # could interfere with the results of this test.
 
-CFLAGS	+= -DRUNDIR=\"${RUNDIR}\" -fno-stack-protector
-CFLAGS	+= $(shell portageq has_version / sys-devel/hardened-gcc && \
-	echo -yet_exec -yno_propolice)
-
+CFLAGS	:= -DRUNDIR=\"${RUNDIR}\" -fno-stack-protector
 
 TESTS=	anonmap \
 	execbss \
@@ -60,7 +59,7 @@
 clean:
 	-rm -f *.o *.s *~ core
 	-rm -f $(SHLIBS) $(TESTS) $(UTILS)
-	-rm -f paxtest paxtest.log a.out
+	-rm -f paxtest paxtest.log a.out dumpspecs
 
 ifdef DESTDIR
 ifdef BINDIR
@@ -78,10 +77,10 @@
 paxtest: $(TESTS) genpaxtest
 	sh genpaxtest $(TESTS)
 
-anonmap: body.o anonmap.o
-
 crt1S.o: crt1S.S
 
+anonmap: body.o anonmap.o
+
 execbss: body.o execbss.o
 
 execdata: body.o execdata.o
@@ -93,7 +92,7 @@
 getheap1: getheap.o
 	$(CC) $(LDFLAGS) -o $@ $+
 
-getheap2: getheap.o
+getheap2: crt1S.o interp.o getheap.o
 	$(CC) -shared -o $@ $+
 
 getheap.o: getheap.c
@@ -105,7 +104,7 @@
 	$(CC) $(LDFLAGS) -o $@ $+
 	chpax -X $@
 
-getmain2: getmain2.o
+getmain2: crt1S.o interp.o getmain2.o
 	$(CC) -shared -o $@ $+
 
 getmain2.o: getmain.c
diff -Nru paxtest-0.9.5/Makefile.generic paxtest-0.9.5.1/Makefile.generic
--- paxtest-0.9.5/Makefile.generic	2003-11-04 08:44:19.000000000 -0500
+++ paxtest-0.9.5.1/Makefile.generic	2003-11-10 18:19:47.000000000 -0500
@@ -64,7 +64,7 @@
 clean:
 	-rm -f *.o $(CHPAX)/*.o *.s *~ core
 	-rm -f $(SHLIBS) $(TESTS) $(UTILS)
-	-rm -f paxtest chpax paxtest.log a.out
+	-rm -f paxtest chpax paxtest.log a.out dumpspecs
 
 ifdef DESTDIR
 ifdef BINDIR