1.1 --- a/make/com/sun/java/pack/Makefile Fri Jul 25 08:44:20 2008 -0700
1.2 +++ b/make/com/sun/java/pack/Makefile Sun Jul 27 18:42:57 2008 -0700
1.3 @@ -97,9 +97,6 @@
1.4 /D "J2SE_FTYPE=0x1L"
1.5
1.6 RES = $(OBJDIR)/$(PGRM).res
1.7 -
1.8 - # Files built here do not compile with warning level 3 if warnings are fatal
1.9 - COMPILER_WARNINGS_FATAL=false
1.10 else
1.11 LDOUTPUT = -o #Have a space
1.12 LDDFLAGS += -lc
2.1 --- a/make/com/sun/security/auth/module/Makefile Fri Jul 25 08:44:20 2008 -0700
2.2 +++ b/make/com/sun/security/auth/module/Makefile Sun Jul 27 18:42:57 2008 -0700
2.3 @@ -55,9 +55,6 @@
2.4 EXTRA_LIBS += netapi32.lib user32.lib mpr.lib
2.5 endif #fdlibm
2.6 # code generates errors when compiled at warning level 3 and warnings are fatal
2.7 - ifeq ($(ARCH_DATA_MODEL), 64)
2.8 - COMPILER_WARNINGS_FATAL=false
2.9 - endif # ARCH_DATA_MODEL
2.10 endif # windows
2.11
2.12 ifeq ($(PLATFORM), solaris)
3.1 --- a/make/common/Defs-linux.gmk Fri Jul 25 08:44:20 2008 -0700
3.2 +++ b/make/common/Defs-linux.gmk Sun Jul 27 18:42:57 2008 -0700
3.3 @@ -149,10 +149,9 @@
3.4 PIC_CODE_LARGE = -fPIC
3.5 PIC_CODE_SMALL = -fpic
3.6 GLOBAL_KPIC = $(PIC_CODE_LARGE)
3.7 +CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS)
3.8 ifeq ($(ARCH), amd64)
3.9 - CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS) -pipe
3.10 -else
3.11 - CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS)
3.12 + CFLAGS_COMMON += -pipe
3.13 endif
3.14
3.15 # Linux 64bit machines use Dwarf2, which can be HUGE, have fastdebug use -g1
4.1 --- a/make/common/Defs-solaris.gmk Fri Jul 25 08:44:20 2008 -0700
4.2 +++ b/make/common/Defs-solaris.gmk Sun Jul 27 18:42:57 2008 -0700
4.3 @@ -40,6 +40,9 @@
4.4 # LDLIBS (set $(EXTRA_LIBS) instead)
4.5 # LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
4.6 # LINTFLAGS (set $(OTHER_LINTFLAGS) instead)
4.7 +#
4.8 +# Note: CPPFLAGS are used in C and C++ compiles.
4.9 +#
4.10
4.11 # Get shared JDK settings
4.12 include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
4.13 @@ -112,6 +115,10 @@
4.14 # Required with many of the source files.
4.15 # -mt Assume multi-threaded (important)
4.16 #
4.17 +# The more unusual options to the Sun C compiler:
4.18 +# +w Print more warnings
4.19 +# +w2 Maximum warnings
4.20 +#
4.21
4.22 #
4.23 # Debug flag for C and C++ compiler
4.24 @@ -140,15 +147,34 @@
4.25 CXXFLAGS_DEBUG_OPTION = -g0 $(CC_FASTDEBUG_OPT)
4.26 endif
4.27
4.28 -CFLAGS_COMMON = -v -mt -L$(OBJDIR) -xc99=%none
4.29 +CFLAGS_COMMON = -L$(OBJDIR)
4.30 +
4.31 +# Do not allow C99 language features like declarations in code etc.
4.32 +CFLAGS_COMMON += -xc99=%none
4.33 +
4.34 +# Allow C++ comments in C code
4.35 CFLAGS_COMMON += -xCC
4.36 -CFLAGS_COMMON += -errshort=tags
4.37 +
4.38 +# Show error message tags on errors
4.39 +CFLAGS_COMMON += -errshort=tags
4.40 +CXXFLAGS_COMMON += -errtags=yes
4.41 +
4.42 +# Optimization flags
4.43 CFLAGS_OPT = $(POPT)
4.44 +
4.45 +# Debug version flags
4.46 CFLAGS_DBG = $(CFLAGS_DEBUG_OPTION)
4.47 -CFLAGS_COMMON += -Xa $(CFLAGS_REQUIRED)
4.48 +
4.49 +# Required C compiler flags
4.50 +CFLAGS_COMMON += -Xa $(CFLAGS_REQUIRED)
4.51 +
4.52 +# Maximum warnings all the time
4.53 +CXXFLAGS_COMMON += +w
4.54 +CFLAGS_COMMON += -v
4.55
4.56 # Assume MT behavior all the time (important)
4.57 -CXXFLAGS_COMMON = -mt
4.58 +CXXFLAGS_COMMON += -mt
4.59 +CFLAGS_COMMON += -mt
4.60
4.61 # Assume no C++ exceptions are used
4.62 CXXFLAGS_COMMON += -features=no%except -DCC_NOEX
4.63 @@ -237,8 +263,8 @@
4.64 # OTHER_CFLAGS += -DPERTURBALOT
4.65 #
4.66
4.67 -CPPFLAGS_COMMON = -D$(ARCH_FAMILY) -D__solaris__ -D_REENTRANT
4.68 -CPPFLAGS_OPT =
4.69 +CPPFLAGS_COMMON = -D__solaris__ -D$(ARCH_FAMILY)
4.70 +CPPFLAGS_OPT = -DNDEBUG
4.71 CPPFLAGS_DBG = -DDEBUG
4.72
4.73 ifeq ($(ARCH_FAMILY), i586)
5.1 --- a/make/common/Defs-windows.gmk Fri Jul 25 08:44:20 2008 -0700
5.2 +++ b/make/common/Defs-windows.gmk Sun Jul 27 18:42:57 2008 -0700
5.3 @@ -283,7 +283,7 @@
5.4 ifeq ($(ARCH), amd64)
5.5 CPPFLAGS_COMMON += -D_AMD64_ -Damd64
5.6 else
5.7 - CPPFLAGS_COMMON += -DWIN32 -D_X86_ -Dx86
5.8 + CPPFLAGS_COMMON += -D_X86_ -Dx86
5.9 endif
5.10 CPPFLAGS_COMMON += -DWIN32_LEAN_AND_MEAN
5.11
5.12 @@ -293,16 +293,23 @@
5.13 CFLAGS_COMMON += -Fd$(OBJDIR)/$(basename $(@F)).pdb -Fm$(OBJDIR)/$(basename $(@F)).map
5.14
5.15 #
5.16 +# Use -wdNNNN to disable warning NNNN.
5.17 +# C4800 is a warning about bool performance casts (can't make go away)
5.18 +#
5.19 +COMPILER_WARNINGS_TO_IGNORE = 4800
5.20 +CFLAGS_COMMON += $(COMPILER_WARNINGS_TO_IGNORE:%=-wd%)
5.21 +
5.22 +#
5.23 # Add warnings and extra on 64bit issues
5.24 #
5.25 ifeq ($(ARCH_DATA_MODEL), 64)
5.26 CFLAGS_COMMON += -Wp64
5.27 endif
5.28 -CFLAGS_COMMON += -W$(COMPILER_WARNING_LEVEL)
5.29
5.30 #
5.31 # Treat compiler warnings as errors, if requested
5.32 #
5.33 +CFLAGS_COMMON += -W$(COMPILER_WARNING_LEVEL)
5.34 ifeq ($(COMPILER_WARNINGS_FATAL),true)
5.35 CFLAGS_COMMON += -WX
5.36 endif
5.37 @@ -352,17 +359,9 @@
5.38 # BUILD_WIN_SA=1
5.39 # on the make command.
5.40 ifdef BUILD_WIN_SA
5.41 - ifeq ($(ARCH), amd64)
5.42 - INCLUDE_SA = true
5.43 - else
5.44 - INCLUDE_SA = true
5.45 - endif
5.46 + INCLUDE_SA = true
5.47 else
5.48 - ifeq ($(ARCH), amd64)
5.49 - INCLUDE_SA = false
5.50 - else
5.51 - INCLUDE_SA = false
5.52 - endif
5.53 + INCLUDE_SA = false
5.54 endif
5.55 endif
5.56
6.1 --- a/make/common/shared/Compiler-gcc.gmk Fri Jul 25 08:44:20 2008 -0700
6.2 +++ b/make/common/shared/Compiler-gcc.gmk Sun Jul 27 18:42:57 2008 -0700
6.3 @@ -73,23 +73,18 @@
6.4 REQUIRED_CC_VER = 4.0
6.5 REQUIRED_GCC_VER = 4.0.*
6.6 else
6.7 - ifeq ($(ARCH_DATA_MODEL), 32)
6.8 - # i586
6.9 REQUIRED_CC_VER = 3.2
6.10 - REQUIRED_GCC_VER = 3.2.1*
6.11 - REQUIRED_GCC_VER_INT = 3.2.1-7a
6.12 - else
6.13 - ifeq ($(ARCH), amd64)
6.14 - # amd64
6.15 - REQUIRED_CC_VER = 3.2
6.16 - REQUIRED_GCC_VER = 3.2.*
6.17 - endif
6.18 - ifeq ($(ARCH), ia64)
6.19 - # ia64
6.20 - REQUIRED_CC_VER = 3.2
6.21 - REQUIRED_GCC_VER = 2.9[56789].*
6.22 - endif
6.23 - endif
6.24 + ifeq ($(ARCH_DATA_MODEL), 32)
6.25 + REQUIRED_GCC_VER = 3.2.1*
6.26 + REQUIRED_GCC_VER_INT = 3.2.1-7a
6.27 + else
6.28 + ifeq ($(ARCH), amd64)
6.29 + REQUIRED_GCC_VER = 3.2.*
6.30 + endif
6.31 + ifeq ($(ARCH), ia64)
6.32 + REQUIRED_GCC_VER = 2.9[56789].*
6.33 + endif
6.34 + endif
6.35 endif
6.36 # Option used to create a shared library
6.37 SHARED_LIBRARY_FLAG = -shared -mimpure-text
7.1 --- a/make/common/shared/Defs-java.gmk Fri Jul 25 08:44:20 2008 -0700
7.2 +++ b/make/common/shared/Defs-java.gmk Sun Jul 27 18:42:57 2008 -0700
7.3 @@ -107,7 +107,10 @@
7.4 ifeq ($(DEBUG_CLASSFILES),true)
7.5 JAVACFLAGS += -g
7.6 endif
7.7 -ifeq ($(COMPILER_WARNINGS_FATAL), true)
7.8 +ifeq ($(JAVAC_MAX_WARNINGS), true)
7.9 + JAVACFLAGS += -Xlint:all
7.10 +endif
7.11 +ifeq ($(JAVAC_WARNINGS_FATAL), true)
7.12 JAVACFLAGS += -Werror
7.13 endif
7.14
7.15 @@ -180,7 +183,10 @@
7.16 # The javac options supplied to the boot javac is limited. This compiler
7.17 # should only be used to build the 'make/tools' sources, which are not
7.18 # class files that end up in the classes directory.
7.19 -ifeq ($(COMPILER_WARNINGS_FATAL), true)
7.20 +ifeq ($(JAVAC_MAX_WARNINGS), true)
7.21 + BOOT_JAVACFLAGS += -Xlint:all
7.22 +endif
7.23 +ifeq ($(JAVAC_WARNINGS_FATAL), true)
7.24 BOOT_JAVACFLAGS += -Werror
7.25 endif
7.26 BOOT_JAVACFLAGS += -encoding ascii
8.1 --- a/make/common/shared/Platform.gmk Fri Jul 25 08:44:20 2008 -0700
8.2 +++ b/make/common/shared/Platform.gmk Sun Jul 27 18:42:57 2008 -0700
8.3 @@ -373,35 +373,41 @@
8.4 REQUIRED_DXSDK_VER = 0x0700
8.5 OS_VENDOR = Microsoft
8.6 # How much RAM does this machine have:
8.7 - ifeq ($(USING_CYGWIN),true)
8.8 - # CYGWIN has the 'free' utility
8.9 - _MB_OF_MEMORY := \
8.10 - $(shell free -m | grep Mem: | awk '{print $$2;}' )
8.11 - else
8.12 - # Windows 2000 has the mem utility, but two memory areas
8.13 - # extended memory is what is beyond 1024M
8.14 - _B_OF_EXT_MEMORY := \
8.15 - $(shell mem 2> $(DEV_NULL) | grep 'total contiguous extended memory' | awk '{print $$1;}')
8.16 - ifeq ($(_B_OF_EXT_MEMORY),)
8.17 - _B_OF_MEMORY := \
8.18 - $(shell mem 2> $(DEV_NULL) | grep 'total conventional memory' | awk '{print $$1;}')
8.19 + ifeq ($(JDK_HAS_MEM_INFO),)
8.20 + ifeq ($(USING_CYGWIN),true)
8.21 + # CYGWIN has the 'free' utility
8.22 + _MB_OF_MEMORY := \
8.23 + $(shell free -m | grep Mem: | awk '{print $$2;}' )
8.24 else
8.25 - _B_OF_MEMORY := \
8.26 - $(shell expr 1048576 '+' $(_B_OF_EXT_MEMORY) 2> $(DEV_NULL))
8.27 + # Windows 2000 has the mem utility, but two memory areas
8.28 + # extended memory is what is beyond 1024M
8.29 + _B_OF_EXT_MEMORY := \
8.30 + $(shell mem 2> $(DEV_NULL) | \
8.31 + grep 'total contiguous extended memory' | awk '{print $$1;}')
8.32 + ifeq ($(_B_OF_EXT_MEMORY),)
8.33 + _B_OF_MEMORY := \
8.34 + $(shell mem 2> $(DEV_NULL) | \
8.35 + grep 'total conventional memory' | awk '{print $$1;}')
8.36 + else
8.37 + _B_OF_MEMORY := \
8.38 + $(shell expr 1048576 '+' $(_B_OF_EXT_MEMORY) 2> $(DEV_NULL))
8.39 + endif
8.40 + ifeq ($(_B_OF_MEMORY),)
8.41 + # Windows 2003 has the systeminfo utility use it if mem doesn't work
8.42 + _MB_OF_MEMORY := \
8.43 + $(shell systeminfo 2> $(DEV_NULL) | \
8.44 + grep 'Total Physical Memory:' | \
8.45 + awk '{print $$4;}' | sed -e 's@,@@')
8.46 + else
8.47 + _MB_OF_MEMORY := $(shell expr $(_B_OF_MEMORY) '/' 1024 2> $(DEV_NULL))
8.48 + endif
8.49 endif
8.50 - ifeq ($(_B_OF_MEMORY),)
8.51 - # Windows 2003 has the systeminfo utility use it if mem doesn't work
8.52 - _MB_OF_MEMORY := \
8.53 - $(shell systeminfo 2> $(DEV_NULL) | grep 'Total Physical Memory:' | awk '{print $$4;}' | sed -e 's@,@@')
8.54 + ifeq ($(shell expr $(_MB_OF_MEMORY) '+' 0 2> $(DEV_NULL)), $(_MB_OF_MEMORY))
8.55 + MB_OF_MEMORY := $(_MB_OF_MEMORY)
8.56 else
8.57 - _MB_OF_MEMORY := $(shell expr $(_B_OF_MEMORY) '/' 1024 2> $(DEV_NULL))
8.58 + MB_OF_MEMORY := 512
8.59 endif
8.60 endif
8.61 - ifeq ($(shell expr $(_MB_OF_MEMORY) '+' 0 2> $(DEV_NULL)), $(_MB_OF_MEMORY))
8.62 - MB_OF_MEMORY := $(_MB_OF_MEMORY)
8.63 - else
8.64 - MB_OF_MEMORY := 512
8.65 - endif
8.66 endif
8.67
8.68 REQUIRED_ZIP_VER = 2.2
8.69 @@ -446,30 +452,38 @@
8.70 # system swapping during the build.
8.71 # If we don't know, assume 512. Subtract 128 from MB for VM MAX.
8.72 # Don't set VM max over 1024-128=896.
8.73 -ifneq ($(MB_OF_MEMORY),)
8.74 - LOW_MEMORY_MACHINE := $(shell \
8.75 - if [ $(MB_OF_MEMORY) -le 512 ] ; then \
8.76 - echo "true"; \
8.77 - else \
8.78 - echo "false"; \
8.79 - fi)
8.80 - MAX_VM_MEMORY := $(shell \
8.81 - if [ $(MB_OF_MEMORY) -le 1024 ] ; then \
8.82 - expr $(MB_OF_MEMORY) '-' 128 2> $(DEV_NULL) ; \
8.83 - else \
8.84 - echo "896"; \
8.85 - fi)
8.86 - MIN_VM_MEMORY := $(shell \
8.87 - if [ $(MAX_VM_MEMORY) -le 128 ] ; then \
8.88 - expr $(MAX_VM_MEMORY) '-' 8 2> $(DEV_NULL) ; \
8.89 - else \
8.90 - echo "128"; \
8.91 - fi)
8.92 -else
8.93 - MB_OF_MEMORY := unknown
8.94 - LOW_MEMORY_MACHINE := true
8.95 - MAX_VM_MEMORY := 384
8.96 - MIN_VM_MEMORY := 128
8.97 +ifeq ($(JDK_HAS_MEM_INFO),)
8.98 + JDK_HAS_MEM_INFO=true
8.99 + export JDK_HAS_MEM_INFO
8.100 + ifneq ($(MB_OF_MEMORY),)
8.101 + LOW_MEMORY_MACHINE := $(shell \
8.102 + if [ $(MB_OF_MEMORY) -le 512 ] ; then \
8.103 + echo "true"; \
8.104 + else \
8.105 + echo "false"; \
8.106 + fi)
8.107 + MAX_VM_MEMORY := $(shell \
8.108 + if [ $(MB_OF_MEMORY) -le 1024 ] ; then \
8.109 + expr $(MB_OF_MEMORY) '-' 128 2> $(DEV_NULL) ; \
8.110 + else \
8.111 + echo "896"; \
8.112 + fi)
8.113 + MIN_VM_MEMORY := $(shell \
8.114 + if [ $(MAX_VM_MEMORY) -le 128 ] ; then \
8.115 + expr $(MAX_VM_MEMORY) '-' 8 2> $(DEV_NULL) ; \
8.116 + else \
8.117 + echo "128"; \
8.118 + fi)
8.119 + else
8.120 + MB_OF_MEMORY := unknown
8.121 + LOW_MEMORY_MACHINE := true
8.122 + MAX_VM_MEMORY := 384
8.123 + MIN_VM_MEMORY := 128
8.124 + endif
8.125 + export MB_OF_MEMORY
8.126 + export LOW_MEMORY_MACHINE
8.127 + export MAX_VM_MEMORY
8.128 + export MIN_VM_MEMORY
8.129 endif
8.130
8.131 # If blanks in the username, use the first 4 words and pack them together
9.1 --- a/make/java/fdlibm/Makefile Fri Jul 25 08:44:20 2008 -0700
9.2 +++ b/make/java/fdlibm/Makefile Sun Jul 27 18:42:57 2008 -0700
9.3 @@ -46,8 +46,6 @@
9.4 _OPT = $(CC_NO_OPT)
9.5 OTHER_CFLAGS =
9.6 CPPFLAGS_DBG += -DLOGGING
9.7 - # Files built here do not compile with warning level 3 if warnings are fatal
9.8 - COMPILER_WARNINGS_FATAL=false
9.9 endif
9.10
9.11 #
10.1 --- a/make/java/hpi/windows/Makefile Fri Jul 25 08:44:20 2008 -0700
10.2 +++ b/make/java/hpi/windows/Makefile Sun Jul 27 18:42:57 2008 -0700
10.3 @@ -37,8 +37,6 @@
10.4 # windows compiler flags
10.5 ifeq ($(PLATFORM),windows)
10.6 CPPFLAGS_DBG += -DLOGGING
10.7 - # Files built here do not compile with warning level 3 if warnings are fatal
10.8 - COMPILER_WARNINGS_FATAL=false
10.9 endif
10.10
10.11 FILES_c = \
11.1 --- a/make/java/java/Makefile Fri Jul 25 08:44:20 2008 -0700
11.2 +++ b/make/java/java/Makefile Sun Jul 27 18:42:57 2008 -0700
11.3 @@ -37,8 +37,6 @@
11.4 # windows compiler flags
11.5 ifeq ($(PLATFORM),windows)
11.6 OTHER_CFLAGS =
11.7 - # Files built here do not compile with warning level 3 if warnings are fatal
11.8 - COMPILER_WARNINGS_FATAL=false
11.9 # build directly into BINDIR...
11.10 LIB_LOCATION = $(BINDIR)
11.11 # Exported functions
12.1 --- a/make/java/java_crw_demo/Makefile Fri Jul 25 08:44:20 2008 -0700
12.2 +++ b/make/java/java_crw_demo/Makefile Sun Jul 27 18:42:57 2008 -0700
12.3 @@ -48,11 +48,6 @@
12.4 OTHER_INCLUDES = -I$(SRCDIR)
12.5
12.6 #
12.7 -# This removes all asserts in the optimized version
12.8 -#
12.9 -CPPFLAGS_OPT += -DNDEBUG
12.10 -
12.11 -#
12.12 # Library to compile.
12.13 #
12.14 include $(BUILDDIR)/common/Library.gmk
13.1 --- a/make/java/java_hprof_demo/Makefile Fri Jul 25 08:44:20 2008 -0700
13.2 +++ b/make/java/java_hprof_demo/Makefile Sun Jul 27 18:42:57 2008 -0700
13.3 @@ -92,11 +92,6 @@
13.4 INIT += $(LIBDIR)/jvm.hprof.txt
13.5
13.6 #
13.7 -# This removes all asserts in the optimized version
13.8 -#
13.9 -CPPFLAGS_OPT += -DNDEBUG
13.10 -
13.11 -#
13.12 # This puts logging code in
13.13 #
13.14 CPPFLAGS_DBG += -DHPROF_LOGGING
14.1 --- a/make/java/jli/Makefile Fri Jul 25 08:44:20 2008 -0700
14.2 +++ b/make/java/jli/Makefile Sun Jul 27 18:42:57 2008 -0700
14.3 @@ -115,9 +115,6 @@
14.4 -export:JLI_ManifestIterate \
14.5 -export:JLI_SetTraceLauncher
14.6
14.7 - # Files from zlib built here do not compile with warning level 3
14.8 - # if warnings are fatal
14.9 - COMPILER_WARNINGS_FATAL=false
14.10 endif
14.11
14.12 OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
15.1 --- a/make/java/net/Makefile Fri Jul 25 08:44:20 2008 -0700
15.2 +++ b/make/java/net/Makefile Sun Jul 27 18:42:57 2008 -0700
15.3 @@ -94,8 +94,6 @@
15.4
15.5 ifeq ($(PLATFORM), windows)
15.6 OTHER_LDLIBS = ws2_32.lib $(JVMLIB)
15.7 - # Will not compile at warning level 3 if warnings are fatal
15.8 - COMPILER_WARNINGS_FATAL=false
15.9 else
15.10 OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB)
15.11 endif
16.1 --- a/make/java/nio/Makefile Fri Jul 25 08:44:20 2008 -0700
16.2 +++ b/make/java/nio/Makefile Sun Jul 27 18:42:57 2008 -0700
16.3 @@ -134,7 +134,6 @@
16.4 $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/FileDescriptor_md.obj
16.5 endif
16.6 ifeq ($(PLATFORM), linux)
16.7 -COMPILER_WARNINGS_FATAL=true
16.8 OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
16.9 endif
16.10 ifeq ($(PLATFORM), solaris)
17.1 --- a/make/java/npt/Makefile Fri Jul 25 08:44:20 2008 -0700
17.2 +++ b/make/java/npt/Makefile Sun Jul 27 18:42:57 2008 -0700
17.3 @@ -53,11 +53,6 @@
17.4 OTHER_INCLUDES = -I$(SRCDIR) -I$(PSRCDIR)
17.5
17.6 #
17.7 -# This removes all asserts in the optimized version
17.8 -#
17.9 -CPPFLAGS_OPT += -DNDEBUG
17.10 -
17.11 -#
17.12 # Library to compile.
17.13 #
17.14 include $(BUILDDIR)/common/Library.gmk
18.1 --- a/make/java/verify/Makefile Fri Jul 25 08:44:20 2008 -0700
18.2 +++ b/make/java/verify/Makefile Sun Jul 27 18:42:57 2008 -0700
18.3 @@ -43,8 +43,6 @@
18.4 #
18.5 JAVALIB =
18.6 EXTRA_LIBS =
18.7 - # Files built here do not compile with warning level 3 if warnings are fatal
18.8 - COMPILER_WARNINGS_FATAL=false
18.9 endif
18.10
18.11 #
19.1 --- a/make/java/zip/Makefile Fri Jul 25 08:44:20 2008 -0700
19.2 +++ b/make/java/zip/Makefile Sun Jul 27 18:42:57 2008 -0700
19.3 @@ -49,9 +49,6 @@
19.4
19.5 ifneq ($(PLATFORM), windows)
19.6 OTHER_CFLAGS += -DUSE_MMAP
19.7 -else
19.8 - # Files built here do not compile with warning level 3 if warnings are fatal
19.9 - COMPILER_WARNINGS_FATAL=false
19.10 endif
19.11
19.12 #
20.1 --- a/make/jpda/back/Makefile Fri Jul 25 08:44:20 2008 -0700
20.2 +++ b/make/jpda/back/Makefile Sun Jul 27 18:42:57 2008 -0700
20.3 @@ -53,11 +53,6 @@
20.4 endif # PLATFORM
20.5
20.6 #
20.7 -# This turns off all assert() checking in the optimized library
20.8 -#
20.9 -CPPFLAGS_OPT += -DNDEBUG
20.10 -
20.11 -#
20.12 # This controls the ability to do logging in the library.
20.13 #
20.14 CPPFLAGS_DBG += -DJDWP_LOGGING
21.1 --- a/make/jpda/transport/shmem/Makefile Fri Jul 25 08:44:20 2008 -0700
21.2 +++ b/make/jpda/transport/shmem/Makefile Sun Jul 27 18:42:57 2008 -0700
21.3 @@ -36,13 +36,6 @@
21.4
21.5 include $(BUILDDIR)/common/Defs.gmk
21.6
21.7 -# 64-bit windows does not build at -W3 if warnings are fatal
21.8 -ifeq ($(PLATFORM), windows)
21.9 - ifeq ($(ARCH_DATA_MODEL), 64)
21.10 - COMPILER_WARNINGS_FATAL=false
21.11 - endif
21.12 -endif
21.13 -
21.14 FILES_c = \
21.15 SharedMemoryTransport.c \
21.16 SharedMemoryConnection.c \
22.1 --- a/make/jpda/transport/socket/Makefile Fri Jul 25 08:44:20 2008 -0700
22.2 +++ b/make/jpda/transport/socket/Makefile Sun Jul 27 18:42:57 2008 -0700
22.3 @@ -36,11 +36,6 @@
22.4
22.5 include $(BUILDDIR)/common/Defs.gmk
22.6
22.7 -ifeq ($(PLATFORM), windows)
22.8 - # Files built here do not compile with warning level 3 if warnings are fatal
22.9 - COMPILER_WARNINGS_FATAL=false
22.10 -endif
22.11 -
22.12 ifeq ($(PLATFORM), linux)
22.13 OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
22.14 endif
23.1 --- a/make/sun/cmm/kcms/Makefile Fri Jul 25 08:44:20 2008 -0700
23.2 +++ b/make/sun/cmm/kcms/Makefile Sun Jul 27 18:42:57 2008 -0700
23.3 @@ -47,8 +47,6 @@
23.4 ifeq ($(PLATFORM), windows)
23.5 # Override the default version info with our own resource file (see 5043594)
23.6 VERSIONINFO_RESOURCE = $(CLOSED_SRC)/share/native/sun/java2d/cmm/kcms/cmm.rc
23.7 - # Files built here do not compile with warning level 3 if warnings are fatal
23.8 - COMPILER_WARNINGS_FATAL=false
23.9 endif
23.10
23.11 # Rules
24.1 --- a/make/sun/font/Makefile Fri Jul 25 08:44:20 2008 -0700
24.2 +++ b/make/sun/font/Makefile Sun Jul 27 18:42:57 2008 -0700
24.3 @@ -77,9 +77,6 @@
24.4
24.5 ifeq ($(PLATFORM), windows)
24.6
24.7 - # Files built here do not compile with warning level 3 if warnings are fatal
24.8 - COMPILER_WARNINGS_FATAL=false
24.9 -
24.10 LDLIBS += user32.lib gdi32.lib $(OBJDIR)/../../../sun.awt/awt/$(OBJDIRNAME)/awt.lib
24.11
24.12 OTHER_CFLAGS += -DCC_NOEX
25.1 --- a/make/sun/font/t2k/Makefile Fri Jul 25 08:44:20 2008 -0700
25.2 +++ b/make/sun/font/t2k/Makefile Sun Jul 27 18:42:57 2008 -0700
25.3 @@ -64,9 +64,6 @@
25.4
25.5 ifeq ($(PLATFORM), windows)
25.6
25.7 - # Files built here do not compile with warning level 3 if warnings are fatal
25.8 - COMPILER_WARNINGS_FATAL=false
25.9 -
25.10 # t2k imports several shared methods from fontmanager.dll
25.11 LDLIBS += user32.lib $(OBJDIR)/../../../sun.font/fontmanager/$(OBJDIRNAME)/fontmanager.lib
25.12
26.1 --- a/make/sun/jdbc/Makefile Fri Jul 25 08:44:20 2008 -0700
26.2 +++ b/make/sun/jdbc/Makefile Sun Jul 27 18:42:57 2008 -0700
26.3 @@ -69,11 +69,6 @@
26.4 INIT += $(ODBC_FAKE_LIBRARIES)
26.5 endif
26.6
26.7 -ifeq ($(PLATFORM),windows)
26.8 - # Files built here do not compile with warning level 3 if warnings are fatal
26.9 - COMPILER_WARNINGS_FATAL=false
26.10 -endif
26.11 -
26.12 #
26.13 # Rules
26.14 #
27.1 --- a/make/sun/jpeg/Makefile Fri Jul 25 08:44:20 2008 -0700
27.2 +++ b/make/sun/jpeg/Makefile Sun Jul 27 18:42:57 2008 -0700
27.3 @@ -73,10 +73,5 @@
27.4 #
27.5 vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
27.6
27.7 -ifeq ($(PLATFORM), windows)
27.8 - # Files built here do not compile with warning level 3 if warnings are fatal
27.9 - COMPILER_WARNINGS_FATAL=false
27.10 -endif # PLATFORM
27.11 -
27.12 CLASSES.export += java.io.InputStream
27.13