stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8001191: use -source 8 -target 8 when compiling the JDK

Browse Source 
Reviewed-by: chegar, dholmes, erikj, jgish
This commit is contained in:
Kumar Srinivasan 2012-11-05 14:53:05 -08:00
parent bd748175f8
commit 99a97c7d3a
7 changed files with 12 additions and 17 deletions
jdk
make
common/shared
Defs-control.gmkDefs-java.gmk
java/invoke
Makefile
makefiles
Setup.gmk
src/share
classes/sun/tools/java
RuntimeConstants.java
native/java/lang
System.c
test
ProblemList.txt

6
jdk/make/common/shared/Defs-control.gmk

@ -1,5 +1,5 @@
# #
# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -88,9 +88,9 @@ ABS_TEMP_DIR = $(ABS_OUTPUTDIR)/tmp
dummy := $(shell $(MKDIR) -p $(TEMP_DIR)) dummy := $(shell $(MKDIR) -p $(TEMP_DIR))
# The language version we want for this jdk build # The language version we want for this jdk build
SOURCE_LANGUAGE_VERSION=7 SOURCE_LANGUAGE_VERSION=8
# The class version we want for this jdk build # The class version we want for this jdk build
TARGET_CLASS_VERSION=7 TARGET_CLASS_VERSION=8
# The MESSAGE, WARNING and ERROR files are used to store sanity check and # The MESSAGE, WARNING and ERROR files are used to store sanity check and
# source check messages, warnings and errors. # source check messages, warnings and errors.

4
jdk/make/common/shared/Defs-java.gmk

@ -143,12 +143,12 @@ ifeq ($(wildcard $(SHARE_SRC)/classes/javax/crypto/Cipher.java),)
endif endif
# Add the source level # Add the source level
SOURCE_LANGUAGE_VERSION = 7 SOURCE_LANGUAGE_VERSION = 8
LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION) LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION)
JAVACFLAGS += $(LANGUAGE_VERSION) JAVACFLAGS += $(LANGUAGE_VERSION)
# Add the class version we want # Add the class version we want
TARGET_CLASS_VERSION = 7 TARGET_CLASS_VERSION = 8
CLASS_VERSION = -target $(TARGET_CLASS_VERSION) CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
JAVACFLAGS += $(CLASS_VERSION) JAVACFLAGS += $(CLASS_VERSION)
JAVACFLAGS += -encoding ascii JAVACFLAGS += -encoding ascii

6
jdk/make/java/invoke/Makefile

@ -1,5 +1,5 @@
# #
# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -36,7 +36,7 @@ FILES_java = \
# The sources built here use new language syntax to generate # The sources built here use new language syntax to generate
# method handle calls. Let's be sure we are using that format. # method handle calls. Let's be sure we are using that format.
LANGUAGE_VERSION = -source 7 LANGUAGE_VERSION = -source 8
CLASS_VERSION = -target 7 CLASS_VERSION = -target 8
include $(BUILDDIR)/common/Classes.gmk include $(BUILDDIR)/common/Classes.gmk

2
jdk/makefiles/Setup.gmk

@ -45,7 +45,7 @@ $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\
JVM:=$(JAVA),\ JVM:=$(JAVA),\
JAVAC:=$(JAVAC_JARS),\ JAVAC:=$(JAVAC_JARS),\
JAVAH:=$(JAVAH_JARS),\ JAVAH:=$(JAVAH_JARS),\
FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 7 -target 7 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS),\ FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS),\
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))

4
jdk/src/share/classes/sun/tools/java/RuntimeConstants.java

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -67,7 +67,7 @@ public interface RuntimeConstants {
/* Class File Constants */ /* Class File Constants */
int JAVA_MAGIC = 0xcafebabe; int JAVA_MAGIC = 0xcafebabe;
int JAVA_MIN_SUPPORTED_VERSION = 45; int JAVA_MIN_SUPPORTED_VERSION = 45;
int JAVA_MAX_SUPPORTED_VERSION = 51; int JAVA_MAX_SUPPORTED_VERSION = 52;
int JAVA_MAX_SUPPORTED_MINOR_VERSION = 0; int JAVA_MAX_SUPPORTED_MINOR_VERSION = 0;
/* Generate class file version for 1.1 by default */ /* Generate class file version for 1.1 by default */

2
jdk/src/share/native/java/lang/System.c

@ -102,7 +102,7 @@ Java_java_lang_System_identityHashCode(JNIEnv *env, jobject this, jobject x)
#define VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/" #define VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/"
#endif #endif
#define JAVA_MAX_SUPPORTED_VERSION 51 #define JAVA_MAX_SUPPORTED_VERSION 52
#define JAVA_MAX_SUPPORTED_MINOR_VERSION 0 #define JAVA_MAX_SUPPORTED_MINOR_VERSION 0
#ifdef JAVA_SPECIFICATION_VENDOR /* Third party may NOT overwrite this. */ #ifdef JAVA_SPECIFICATION_VENDOR /* Third party may NOT overwrite this. */

5
jdk/test/ProblemList.txt

@ -137,11 +137,6 @@ java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java generic-all
# 7196801 # 7196801
java/lang/management/MemoryMXBean/LowMemoryTest2.sh generic-all java/lang/management/MemoryMXBean/LowMemoryTest2.sh generic-all
# Exclude until hotspot/jdk repos are sync'd w.r.t. JAVA_MAX_SUPPORTED_VERSION
# Needed when hotspot fix 7054345 is present. Remove when the JDK source is
# updated accordingly.
java/lang/System/Versions.java generic-all
############################################################################ ############################################################################
# jdk_management # jdk_management