diff options
author | Erkka Kääriä <erkka.kaaria@intel.com> | 2016-08-09 10:32:17 +0300 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2016-08-24 13:49:01 +0300 |
commit | 0eeeb059751c00042bd0341d17f5cceddef3c502 (patch) | |
tree | d3e337cca462ec96e6ee3730b611565c755db983 /recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch | |
parent | 0d58a4fb4236edeeeb3f23a66c0c14279066c8bb (diff) | |
download | meta-java-0eeeb059751c00042bd0341d17f5cceddef3c502.tar.gz |
openjdk-8: Upgrade from u72 to u102
Openjdk is upgraded from u72 to u102. Two patches are dropped, as these
were backports and the fixes are present in the current version. One
patch was refreshed. One patch was backported from the upcoming u112 to
fix a zero mode crash.
Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch deleted file mode 100644 index 528560c..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | # HG changeset patch | ||
2 | # User andrew | ||
3 | # Date 1452261185 0 | ||
4 | # Fri Jan 08 13:53:05 2016 +0000 | ||
5 | # Node ID 92c6a16b6daccda4b7c7f9612e4057df006b9f22 | ||
6 | # Parent b95e325137b439b33a7bb013be21475df5da3a03 | ||
7 | 8146566: OpenJDK build can't handle commas in LDFLAGS | ||
8 | Summary: Backport part of 8142907 to avoid early LDFLAGS expansion | ||
9 | Reviewed-by: erikj | ||
10 | |||
11 | diff --git jdk/make/CompileDemos.gmk jdk/make/CompileDemos.gmk | ||
12 | --- jdk/make/CompileDemos.gmk | ||
13 | +++ jdk/make/CompileDemos.gmk | ||
14 | @@ -224,17 +224,17 @@ define SetupJVMTIDemo | ||
15 | $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/README.txt) \ | ||
16 | $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/sample.makefile.txt) | ||
17 | BUILD_DEMO_JVMTI_$1_EXTRA_INC := $$(addprefix -I, $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC)) | ||
18 | BUILD_DEMO_JVMTI_$1_LANG := C | ||
19 | ifneq (, $4) | ||
20 | BUILD_DEMO_JVMTI_$1_LANG := $4 | ||
21 | endif | ||
22 | ifeq (C++, $4) | ||
23 | - $1_EXTRA_CXX := $(LDFLAGS_CXX_JDK) $(LIBCXX) | ||
24 | + $1_EXTRA_CXX := $$(LDFLAGS_CXX_JDK) $(LIBCXX) | ||
25 | endif | ||
26 | |||
27 | $1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \ | ||
28 | $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 \ | ||
29 | $(CXXFLAGS_DEBUG_SYMBOLS) | ||
30 | ifeq ($1-$(OPENJDK_TARGET_CPU_ARCH), waiters-sparc) | ||
31 | $1_FILTER := -xregs=no%appl | ||
32 | $1_CXXFLAGS := $$(filter-out $$($1_FILTER), $$($1_CXXFLAGS)) | ||
33 | @@ -246,18 +246,18 @@ define SetupJVMTIDemo | ||
34 | -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 | ||
35 | |||
36 | # Remove the -incremental:no setting to get .ilk-files like in the old build. | ||
37 | $$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \ | ||
38 | SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \ | ||
39 | LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \ | ||
40 | OPTIMIZATION := LOW, \ | ||
41 | CXXFLAGS := $$($1_CXXFLAGS), \ | ||
42 | - LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \ | ||
43 | - LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \ | ||
44 | + LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB)), \ | ||
45 | + LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN), \ | ||
46 | LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \ | ||
47 | LDFLAGS_SUFFIX_posix := $5, \ | ||
48 | LDFLAGS_SUFFIX_windows := $6, \ | ||
49 | LDFLAGS_SUFFIX_solaris := $7 -lc, \ | ||
50 | LDFLAGS_SUFFIX_linux := $8, \ | ||
51 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ | ||
52 | RC_FLAGS := $$(RC_FLAGS) \ | ||
53 | -D "JDK_FNAME=$1.dll" \ | ||