Removed accidentlyreadded patch501 8146566.patch
This commit is contained in:
parent
ee3b4be2f3
commit
421bcca1dc
@ -1,23 +0,0 @@
|
||||
diff -r 3bde96c2f7f5 make/CompileDemos.gmk
|
||||
--- openjdk.orig/jdk/make/CompileDemos.gmk Tue Jan 12 11:47:16 2016 +0000
|
||||
+++ openjdk/jdk/make/CompileDemos.gmk Tue Jan 12 15:47:25 2016 +0000
|
||||
@@ -229,7 +229,7 @@
|
||||
BUILD_DEMO_JVMTI_$1_LANG := $4
|
||||
endif
|
||||
ifeq (C++, $4)
|
||||
- $1_EXTRA_CXX := $(LDFLAGS_CXX_JDK) $(LIBCXX)
|
||||
+ $1_EXTRA_CXX := $$(LDFLAGS_CXX_JDK) $(LIBCXX)
|
||||
endif
|
||||
|
||||
$1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \
|
||||
@@ -251,8 +251,8 @@
|
||||
LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
|
||||
OPTIMIZATION := LOW, \
|
||||
CXXFLAGS := $$($1_CXXFLAGS), \
|
||||
- LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
|
||||
- LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
|
||||
+ LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB)), \
|
||||
+ LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN), \
|
||||
LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
|
||||
LDFLAGS_SUFFIX_posix := $5, \
|
||||
LDFLAGS_SUFFIX_windows := $6, \
|
@ -837,8 +837,6 @@ Patch507: pr2842-02.patch
|
||||
# Fixes StackOverflowError on ARM32 bit Zero. See RHBZ#1206656
|
||||
# 8087120: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms
|
||||
Patch403: rhbz1206656_fix_current_stack_pointer.patch
|
||||
# S8146566, PR2428: OpenJDK build can't handle commas in LDFLAGS
|
||||
Patch501: 8146566.patch
|
||||
# S8143855: Bad printf formatting in frame_zero.cpp
|
||||
Patch505: 8143855.patch
|
||||
|
||||
@ -1121,7 +1119,6 @@ sh %{SOURCE12}
|
||||
%patch602
|
||||
%patch605
|
||||
|
||||
%patch501
|
||||
%patch502
|
||||
%patch503
|
||||
%patch504
|
||||
|
Loading…
Reference in New Issue
Block a user