Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Tue, 05 Feb 2013 18:54:09 -0800
- author
- katleman
- date
- Tue, 05 Feb 2013 18:54:09 -0800
- changeset 612
- 278af9fc67e7
- parent 605
- 5b19cef637a6
- parent 611
- d3d9ab8ee7b0
- child 613
- 3933eebc659d
Merge
1.1 --- a/common/autoconf/generated-configure.sh Thu Jan 31 17:04:19 2013 -0800 1.2 +++ b/common/autoconf/generated-configure.sh Tue Feb 05 18:54:09 2013 -0800 1.3 @@ -3723,7 +3723,7 @@ 1.4 #CUSTOM_AUTOCONF_INCLUDE 1.5 1.6 # Do not change or remove the following line, it is needed for consistency checks: 1.7 -DATE_WHEN_GENERATED=1359376859 1.8 +DATE_WHEN_GENERATED=1359971740 1.9 1.10 ############################################################################### 1.11 # 1.12 @@ -10778,7 +10778,8 @@ 1.13 as_fn_error $? "Milestone must have a value" "$LINENO" 5 1.14 elif test "x$with_milestone" != x; then 1.15 MILESTONE="$with_milestone" 1.16 -else 1.17 +fi 1.18 +if test "x$MILESTONE" = x; then 1.19 MILESTONE=internal 1.20 fi 1.21 1.22 @@ -29247,6 +29248,12 @@ 1.23 fi 1.24 1.25 1.26 +# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling 1.27 +# this doesn't make sense so we remove it. 1.28 +if test "x$COMPILE_TYPE" = xcross; then 1.29 + X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[^ ]*//g'` 1.30 +fi 1.31 + 1.32 if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then 1.33 1.34 # Print a helpful message on how to acquire the necessary build dependency.
2.1 --- a/common/autoconf/spec.gmk.in Thu Jan 31 17:04:19 2013 -0800 2.2 +++ b/common/autoconf/spec.gmk.in Tue Feb 05 18:54:09 2013 -0800 2.3 @@ -434,6 +434,12 @@ 2.4 2.5 JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner 2.6 2.7 +# You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... 2.8 +BOOTSTRAP_JAVAC_JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar 2.9 +BOOTSTRAP_JAVAC_ARGS:="-Xbootclasspath/p:$(BOOTSTRAP_JAVAC_JAR)" -cp $(BOOTSTRAP_JAVAC_JAR) 2.10 +NEW_JAVAC = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javac.Main 2.11 +NEW_JAVADOC = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javadoc.Main 2.12 + 2.13 # Base flags for RC 2.14 # Guarding this against resetting value. Legacy make files include spec multiple 2.15 # times.
3.1 --- a/common/makefiles/IdlCompilation.gmk Thu Jan 31 17:04:19 2013 -0800 3.2 +++ b/common/makefiles/IdlCompilation.gmk Tue Feb 05 18:54:09 2013 -0800 3.3 @@ -71,7 +71,7 @@ 3.4 $4 3.5 $(RM) -f $$(addprefix $3/$$($4_TMPDIR)/,$6) 3.6 $(CP) -rp $3/$$($4_TMPDIR)/* $3 3.7 - ($(CD) $3/$$($4_TMPDIR); find . -type f | sed 's!\./!$3/!g' | awk '{ print $$$$1 ": $4" }' > $5) 3.8 + ($(CD) $3/$$($4_TMPDIR) && $(FIND) . -type f | $(SED) 's!\./!$3/!g' | $(NAWK) '{ print $$$$1 ": $4" }' > $5) 3.9 $(RM) -rf $3/$$($4_TMPDIR) 3.10 endef 3.11
4.1 --- a/common/makefiles/JavaCompilation.gmk Thu Jan 31 17:04:19 2013 -0800 4.2 +++ b/common/makefiles/JavaCompilation.gmk Tue Feb 05 18:54:09 2013 -0800 4.3 @@ -42,8 +42,8 @@ 4.4 FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST 4.5 4.6 define SetupJavaCompiler 4.7 - # param 1 is for example BOOT_JAVAC or NEW_JAVAC 4.8 - # This is the name later used to decide which java compiler to use. 4.9 + # param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE 4.10 + # This is the name of the compiler setup. 4.11 # param 2-9 are named args. 4.12 # JVM:=The jvm used to run the javac/javah command 4.13 # JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out 4.14 @@ -143,8 +143,8 @@ 4.15 ifneq (,$2) 4.16 $1_DEPS:=$2 4.17 else 4.18 - $1_DEPS:=$$(filter $$(addprefix %,$$($1_FIND_PATTERNS)),\ 4.19 - $$(call CacheFind $$($1_SRCS))) 4.20 + $1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)),\ 4.21 + $$(call CacheFind,$$($1_SRCS))) 4.22 ifneq (,$$($1_GREP_INCLUDE_PATTERNS)) 4.23 $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS)) 4.24 endif 4.25 @@ -487,10 +487,10 @@ 4.26 # Using sjavac to compile. 4.27 $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state 4.28 4.29 - # Create SJAVAC variable, 4.30 - # expects $1_JAVAC to be "bootclasspathprepend -jar ...javac.jar" 4.31 - # and it is rewritten into "bootclasspathprepend com.sun.tools.sjavac.Main" 4.32 - $1_SJAVAC:=$$(word 1,$$($1_JAVAC)) -cp $$(word 3,$$($1_JAVAC)) com.sun.tools.sjavac.Main 4.33 + # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be 4.34 + # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main" 4.35 + # and javac is simply replaced with sjavac. 4.36 + $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC)) 4.37 4.38 # Set the $1_REMOTE to spawn a background javac server. 4.39 $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
5.1 --- a/common/makefiles/Jprt.gmk Thu Jan 31 17:04:19 2013 -0800 5.2 +++ b/common/makefiles/Jprt.gmk Tue Feb 05 18:54:09 2013 -0800 5.3 @@ -179,27 +179,52 @@ 5.4 $(JPRT_ARCHIVE_BUNDLE): bundles 5.5 $(MKDIR) -p $(@D) 5.6 $(RM) $@ 5.7 - $(CP) $(BUILD_OUTPUT)/bundles/j2sdk-image.zip $@ 5.8 + $(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@ 5.9 5.10 -# This target must be called in the context of a SPEC file 5.11 -bundles: all 5.12 +ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) 5.13 + SRC_JDK_IMAGE_DIR := $(JDK_OVERLAY_IMAGE_DIR) 5.14 + SRC_JRE_IMAGE_DIR := $(JRE_OVERLAY_IMAGE_DIR) 5.15 +else 5.16 + SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR) 5.17 + SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR) 5.18 +endif 5.19 +SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR) 5.20 +SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR) 5.21 + 5.22 +# Bundle up the images 5.23 +bundles: all bundles-only 5.24 +bundles-only: start-make 5.25 @$(call TargetEnter) 5.26 $(MKDIR) -p $(BUILD_OUTPUT)/bundles 5.27 -ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) 5.28 - $(CD) $(JDK_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . 5.29 - $(CD) $(JRE_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . 5.30 -else 5.31 - $(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . 5.32 - $(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . 5.33 + $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip . 5.34 + $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip . 5.35 if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ 5.36 $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ 5.37 fi 5.38 + @$(call TargetExit) 5.39 + 5.40 +# Copy images to one unified location regardless of platform etc. 5.41 +final-images: all final-images-only 5.42 +final-images-only: start-make 5.43 + @$(call TargetEnter) 5.44 + $(RM) -r $(BUILD_OUTPUT)/final-images 5.45 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR) 5.46 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR) 5.47 + $(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/ 5.48 + $(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/ 5.49 +ifeq ($(OPENJDK_TARGET_OS),macosx) 5.50 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR) 5.51 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR) 5.52 + $(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/ 5.53 + $(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/ 5.54 endif 5.55 @$(call TargetExit) 5.56 5.57 + 5.58 # Keep track of phony targets 5.59 PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \ 5.60 - jprt_build_generic bundles jprt_bundle 5.61 + jprt_build_generic bundles jprt_bundle \ 5.62 + final-images final-images-only 5.63 5.64 ########################################################################### 5.65 # Phony targets
6.1 --- a/common/makefiles/Main.gmk Thu Jan 31 17:04:19 2013 -0800 6.2 +++ b/common/makefiles/Main.gmk Tue Feb 05 18:54:09 2013 -0800 6.3 @@ -75,7 +75,14 @@ 6.4 all: overlay-images 6.5 endif 6.6 6.7 -start-make: 6.8 +# Setup a rule for SPEC file that fails if executed. This check makes sure the configuration 6.9 +# is up to date after changes to configure 6.10 +$(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*) 6.11 + @$(ECHO) ERROR: $(SPEC) is not up to date 6.12 + @$(ECHO) Please rerun configure! 6.13 + @if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi 6.14 + 6.15 +start-make: $(SPEC) 6.16 @$(call AtMakeStart) 6.17 6.18 langtools: langtools-only
7.1 --- a/common/makefiles/javadoc/Javadoc.gmk Thu Jan 31 17:04:19 2013 -0800 7.2 +++ b/common/makefiles/javadoc/Javadoc.gmk Tue Feb 05 18:54:09 2013 -0800 7.3 @@ -46,14 +46,11 @@ 7.4 7.5 BUILD_NUMBER=$(JDK_BUILD_NUMBER) 7.6 7.7 -BOOT_JAVA_CMD=$(JAVA) 7.8 - 7.9 -JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar 7.10 -JAVADOC_CMD = $(BOOT_JAVA_CMD) \ 7.11 +JAVADOC_CMD = $(JAVA) \ 7.12 -Xmx1024m \ 7.13 -Djava.awt.headless=true \ 7.14 - "-Xbootclasspath/p:$(JAVADOC_JAR)" \ 7.15 - -jar $(JAVADOC_JAR) -bootclasspath $(JDK_OUTPUTDIR)/classes 7.16 + $(NEW_JAVADOC) \ 7.17 + -bootclasspath $(JDK_OUTPUTDIR)/classes 7.18 7.19 # Copyright year for beginning of Java and some of the apis 7.20 # (Needed when creating the javadocs)
