--- old/make/defs.make	2009-08-22 04:05:24.239319152 +0100
+++ new/make/defs.make	2009-08-22 04:05:24.152727102 +0100
@@ -226,6 +226,15 @@
   LP64_ARCH = sparcv9 amd64 ia64
 endif
 
+# Settings for javac
+BOOT_SOURCE_LANGUAGE_VERSION = 6
+BOOT_TARGET_CLASS_VERSION = 6
+SA_SOURCE_LANGUAGE_VERSION = 1.4
+SA_TARGET_CLASS_VERSION = 1.4
+JAVAC_FLAGS = -g -encoding ascii
+BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+SA_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(SA_SOURCE_LANGUAGE_VERSION) -target $(SA_TARGET_CLASS_VERSION)
+
 # Required make macro settings for all platforms
 MAKE_ARGS += JAVA_HOME=$(ABS_BOOTDIR)
 MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR)
@@ -233,6 +242,8 @@
 MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE)
 MAKE_ARGS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION)
 MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
+MAKE_ARGS += BOOTSTRAP_JAVAC_FLAGS="$(BOOTSTRAP_JAVAC_FLAGS)"
+MAKE_ARGS += SA_JAVAC_FLAGS="$(SA_JAVAC_FLAGS)"
 
 # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile
 # to overwrite the default definition since OS specific Makefile also