--- TOOLSRC.orig/sys/src/base/ptoc/ptoc/ptoc.c	2005-12-31 00:02:09.000000000 +0100
+++ TOOLSRC/sys/src/base/ptoc/ptoc/ptoc.c	2005-12-31 00:08:50.000000000 +0100
@@ -66,7 +66,13 @@
 
 char	*tfile;
 
-/* MWa */ extern char *malloc () ;
+// begin of deletion
+///* MWa */ extern char *malloc () ;
+// end of deletion
+// begin of insert
+/* MWa */ extern void *malloc () ;
+// end of insert
+
 extern  char *PTOC_id[] ; /* 92-Sep-15 J.Bruehe  forces 'Version.c' even on AIX */
 
 char	*setsuf(), *savestr();
--- TOOLSRC.orig/sys/src/tt/toolvars-tml.pl.tt	2006-01-01 10:36:52.000000000 +0100
+++ TOOLSRC/sys/src/tt/toolvars-tml.pl.tt	2006-01-01 10:38:37.000000000 +0100
@@ -1123,7 +1123,9 @@ if ($ENV{APOMAKE})
 	}
 &elif $OSSPEC = LINUX
 	if ($MACH eq "I386") {
-		@OPTIMIZE = ("-O3", "-march=pentium", "-mcpu=pentiumpro");
+# HM051231 gentoo gcc 3.4.4 patch
+#		@OPTIMIZE = ("-O3", "-march=pentium", "-mcpu=pentiumpro");
+		@OPTIMIZE = ("-O3");
 	} elsif (($MACH eq "IA64") && ($ENV{'COMPILER'} =~ /ICC$/i)) {
 		@OPTIMIZE = ();
 	} elsif ($MACH eq "IA64" || $MACH eq "SDBonPPC64" || $MACH eq "S390X") {
@@ -1208,7 +1210,9 @@ elsif ($CURR_VERSION =~ /^f/i) { 	
 	}
 &elif $OSSPEC = LINUX
 	if ($MACH eq "I386") {
-		@OPTIMIZE = ("-O3", "-march=pentium", "-mcpu=pentiumpro");
+# HM051231 gentoo gcc 3.4.4 patch
+#		@OPTIMIZE = ("-O3", "-march=pentium", "-mcpu=pentiumpro");
+		@OPTIMIZE = ("-O3");
 	} 
 	elsif (($MACH eq "IA64") && ($ENV{'COMPILER'} =~ /ICC$/i)) {
     @OPTIMIZE = ();