From 3161106f0879a6be0a016df3a8bb8fa800bd6044 Mon Sep 17 00:00:00 2001 From: Ulrich Ölmann Date: Thu, 24 Nov 2022 17:32:54 +0100 Subject: openjdk-8: refresh patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich Ölmann Signed-off-by: Richard Leitner --- .../0013-autoconf-remove-Werror.patch | 22 +++++++++++----------- ...-hotspot-Turn-on-the-Wreturn-type-warning.patch | 20 ++++++++++---------- .../1010-hotspot-fix-shark-build-common.patch | 12 ++++++------ .../1012-hotspot-enable-Wno-error.patch | 4 ++-- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch b/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch index d3bd8e7..91fedb5 100644 --- a/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch +++ b/recipes-core/openjdk/patches-openjdk-8/0013-autoconf-remove-Werror.patch @@ -63,10 +63,10 @@ index 077efa2..b98575a 100644 CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" AC_SUBST([NO_LIFETIME_DSE_CFLAG]) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh -index d57035b..1953dc4 100644 +index f285a74..31d41b1 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh -@@ -41498,12 +41498,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } +@@ -41503,12 +41503,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; } fi CXXSTD_CXXFLAG="-std=gnu++98" @@ -82,7 +82,7 @@ index d57035b..1953dc4 100644 ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41654,12 +41654,12 @@ fi +@@ -41659,12 +41659,12 @@ fi NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" @@ -98,7 +98,7 @@ index d57035b..1953dc4 100644 ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41694,12 +41694,12 @@ $as_echo "$supports" >&6; } +@@ -41699,12 +41699,12 @@ $as_echo "$supports" >&6; } fi @@ -114,7 +114,7 @@ index d57035b..1953dc4 100644 ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41733,8 +41733,8 @@ $as_echo "$supports" >&6; } +@@ -41738,8 +41738,8 @@ $as_echo "$supports" >&6; } fi @@ -125,7 +125,7 @@ index d57035b..1953dc4 100644 supports=no if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi -@@ -41750,12 +41750,12 @@ $as_echo "$supports" >&6; } +@@ -41755,12 +41755,12 @@ $as_echo "$supports" >&6; } NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" @@ -141,7 +141,7 @@ index d57035b..1953dc4 100644 ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41789,12 +41789,12 @@ $as_echo "$supports" >&6; } +@@ -41794,12 +41794,12 @@ $as_echo "$supports" >&6; } fi @@ -157,7 +157,7 @@ index d57035b..1953dc4 100644 ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41828,8 +41828,8 @@ $as_echo "$supports" >&6; } +@@ -41833,8 +41833,8 @@ $as_echo "$supports" >&6; } fi @@ -168,7 +168,7 @@ index d57035b..1953dc4 100644 supports=no if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi -@@ -41862,12 +41862,12 @@ $as_echo "$supports" >&6; } +@@ -41867,12 +41867,12 @@ $as_echo "$supports" >&6; } # -mno-fused-madd -fno-strict-aliasing for GCC < 4.6 COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off" @@ -184,7 +184,7 @@ index d57035b..1953dc4 100644 ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41906,12 +41906,12 @@ $as_echo "$supports" >&6; } +@@ -41911,12 +41911,12 @@ $as_echo "$supports" >&6; } test "$OPENJDK_TARGET_CPU_ARCH" = "ppc"; then M_NO_FUSED_ADD_FLAG="-mno-fused-madd" @@ -200,7 +200,7 @@ index d57035b..1953dc4 100644 ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -41946,12 +41946,12 @@ $as_echo "$supports" >&6; } +@@ -41951,12 +41951,12 @@ $as_echo "$supports" >&6; } NO_STRICT_ALIASING_FLAG="-fno-strict-aliasing" diff --git a/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Turn-on-the-Wreturn-type-warning.patch b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Turn-on-the-Wreturn-type-warning.patch index b5173a9..0dc09b6 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Turn-on-the-Wreturn-type-warning.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1007-hotspot-Turn-on-the-Wreturn-type-warning.patch @@ -36,10 +36,10 @@ Signed-off-by: Richard Leitner 13 files changed, 17 insertions(+), 15 deletions(-) diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make -index 36b3c8ba9..cd9511e50 100644 +index ac44b6837..7a5162a06 100644 --- a/hotspot/make/linux/makefiles/gcc.make +++ b/hotspot/make/linux/makefiles/gcc.make -@@ -211,7 +211,7 @@ ifeq ($(USE_CLANG), true) +@@ -212,7 +212,7 @@ ifeq ($(USE_CLANG), true) WARNINGS_ARE_ERRORS += -Wno-return-type -Wno-empty-body endif @@ -95,7 +95,7 @@ index 4b4b4e250..196622aed 100644 diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp -index 83369cbcf..8dd4e6b21 100644 +index ec97077b7..2621a7d62 100644 --- a/hotspot/src/share/vm/classfile/symbolTable.cpp +++ b/hotspot/src/share/vm/classfile/symbolTable.cpp @@ -249,7 +249,7 @@ Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { @@ -117,7 +117,7 @@ index 83369cbcf..8dd4e6b21 100644 Symbol* SymbolTable::lookup_only(const char* name, int len, diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp -index 4541e815a..98412e1e1 100644 +index 5911d94f5..df4d56f6f 100644 --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp @@ -236,15 +236,15 @@ Klass* SystemDictionary::resolve_or_null(Symbol* class_name, Handle class_loader @@ -166,10 +166,10 @@ index 2f3abae6a..d58ebecb2 100644 static ReservedSpace* shared_rs() { CDS_ONLY(return _shared_rs); diff --git a/hotspot/src/share/vm/oops/constantPool.hpp b/hotspot/src/share/vm/oops/constantPool.hpp -index 68435471d..fad4a92cb 100644 +index 124c970e2..dae574c09 100644 --- a/hotspot/src/share/vm/oops/constantPool.hpp +++ b/hotspot/src/share/vm/oops/constantPool.hpp -@@ -350,7 +350,7 @@ class ConstantPool : public Metadata { +@@ -353,7 +353,7 @@ class ConstantPool : public Metadata { Klass* klass_at(int which, TRAPS) { constantPoolHandle h_this(THREAD, this); @@ -177,7 +177,7 @@ index 68435471d..fad4a92cb 100644 + return klass_at_impl(h_this, which, THREAD); } - Symbol* klass_name_at(int which) const; // Returns the name, w/o resolving. + Symbol* klass_name_at(int which); // Returns the name, w/o resolving. diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp index 6f2221c41..daa69f89a 100644 --- a/hotspot/src/share/vm/prims/jvm.cpp @@ -192,7 +192,7 @@ index 6f2221c41..daa69f89a 100644 JVM_ENTRY(jboolean,JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method)) diff --git a/hotspot/src/share/vm/runtime/reflection.cpp b/hotspot/src/share/vm/runtime/reflection.cpp -index 4b39d8ccb..9cd7b0dcb 100644 +index d9fddbe47..a5f737935 100644 --- a/hotspot/src/share/vm/runtime/reflection.cpp +++ b/hotspot/src/share/vm/runtime/reflection.cpp @@ -1093,7 +1093,7 @@ oop Reflection::invoke(instanceKlassHandle klass, methodHandle reflected_method, @@ -205,10 +205,10 @@ index 4b39d8ccb..9cd7b0dcb 100644 } diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp -index d5bea29c3..50578ad63 100644 +index 013aa7a23..df4cde963 100644 --- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp +++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp -@@ -1041,7 +1041,7 @@ Handle SharedRuntime::find_callee_info(JavaThread* thread, Bytecodes::Code& bc, +@@ -1045,7 +1045,7 @@ Handle SharedRuntime::find_callee_info(JavaThread* thread, Bytecodes::Code& bc, // last java frame on stack (which includes native call frames) vframeStream vfst(thread, true); // Do not skip and javaCalls diff --git a/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch index 8e70cab..711d17b 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch @@ -22,10 +22,10 @@ Signed-off-by: Richard Leitner 14 files changed, 123 insertions(+), 12 deletions(-) diff --git a/hotspot/make/Makefile b/hotspot/make/Makefile -index ad195763b..53b5ea046 100644 +index de2607c71..3054c3fe8 100644 --- a/hotspot/make/Makefile +++ b/hotspot/make/Makefile -@@ -525,7 +525,7 @@ $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD_DIR)/../generated/jvmtifiles/% +@@ -536,7 +536,7 @@ $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD_DIR)/../generated/jvmtifiles/% # Unix $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX) $(install-file) @@ -79,10 +79,10 @@ index 4707cc96e..a2b297ca0 100644 flow_block(blk, temp_vector, temp_set); if (failing()) return; // Watch for bailouts. diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp -index 98412e1e1..f62731c43 100644 +index df4d56f6f..b1dd335cb 100644 --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp -@@ -2392,6 +2392,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid +@@ -2371,6 +2371,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid spe = NULL; // Must create lots of stuff here, but outside of the SystemDictionary lock. m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty)); @@ -90,7 +90,7 @@ index 98412e1e1..f62731c43 100644 if (!Arguments::is_interpreter_only()) { // Generate a compiled form of the MH intrinsic. AdapterHandlerLibrary::create_native_wrapper(m); -@@ -2401,6 +2402,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid +@@ -2380,6 +2381,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid "out of space in CodeCache for method handle intrinsic", empty); } } @@ -98,7 +98,7 @@ index 98412e1e1..f62731c43 100644 // Now grab the lock. We might have to throw away the new method, // if a racing thread has managed to install one at the same time. { -@@ -2414,9 +2416,11 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid +@@ -2393,9 +2395,11 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid } assert(spe != NULL && spe->method() != NULL, ""); diff --git a/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch b/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch index 2239d48..aeeba6b 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1012-hotspot-enable-Wno-error.patch @@ -14,10 +14,10 @@ Signed-off-by: Richard Leitner 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make -index cd9511e50..94412c8fe 100644 +index 7a5162a06..67607fb26 100644 --- a/hotspot/make/linux/makefiles/gcc.make +++ b/hotspot/make/linux/makefiles/gcc.make -@@ -200,8 +200,8 @@ else +@@ -201,8 +201,8 @@ else CFLAGS += -pipe endif -- cgit v1.2.3-54-g00ecf