--- openjdk/hotspot/build/linux/makefiles/gcc.make.orig	2007-06-21 03:31:17.000000000 -0400
+++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-06-28 13:52:21.514580763 -0400
@@ -93,7 +93,7 @@
 WARNINGS_ARE_ERRORS = -Werror
 # Except for a few acceptable ones
 ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
-CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
+CFLAGS_WARN/DEFAULT = $(ACCEPTABLE_WARNINGS)
 # Special cases
 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
 
--- openjdk/jdk/make/common/Defs-linux.gmk.orig	2007-08-18 01:36:17.000000000 +0200
+++ openjdk/jdk/make/common/Defs-linux.gmk	2007-08-18 02:11:46.000000000 +0200
@@ -141,13 +141,6 @@
 GCC_WARNINGS	= -W -Wall $(GCC_STYLE) $(GCC_INHIBIT)
 
 #
-# Treat compiler warnings as errors, if warnings not allowed
-#
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
-  GCC_WARNINGS += -Werror
-endif
-
-#
 # Misc compiler options
 #
 ifeq ($(ARCH),ppc)