diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2021-10-31 10:59:31 -0700 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2021-10-31 11:07:41 -0700 |
| commit | a9d52e329d39fb914170e582065f10f079eb4c5b (patch) | |
| tree | f213cd58005578c36dcb78a9f92e2214d4889289 /java/openjdk17/files | |
| parent | science/py-cirq-pasqal: Update 0.13.0 -> 0.13.1 (diff) | |
java/openjdk17: Update to 17.0.1
Diffstat (limited to 'java/openjdk17/files')
3 files changed, 0 insertions, 43 deletions
diff --git a/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk b/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk index 11eaa6868f3e..65f66318255d 100644 --- a/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk +++ b/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk @@ -1,14 +1,5 @@ --- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig 2021-09-18 15:30:22.109237000 -0700 +++ make/modules/java.desktop/lib/Awt2dLibraries.gmk 2021-09-18 15:31:02.024314000 -0700 -@@ -435,7 +435,7 @@ - - ifeq ($(USE_EXTERNAL_HARFBUZZ), true) - LIBFONTMANAGER_EXTRA_SRC = -- BUILD_LIBFONTMANAGER_FONTLIB += $(LIBHARFBUZZ_LIBS) -+ BUILD_LIBFONTMANAGER_FONTLIB += $(HARFBUZZ_LIBS) - else - LIBFONTMANAGER_EXTRA_SRC = libharfbuzz - @@ -530,7 +530,7 @@ LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ LDFLAGS_aix := -Wl$(COMMA)-berok, \ diff --git a/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp b/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp index 870868e7690e..402f0f475bc3 100644 --- a/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp +++ b/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp @@ -1,13 +1,5 @@ --- src/hotspot/os/bsd/os_bsd.cpp.orig 2021-09-29 21:25:10 UTC +++ src/hotspot/os/bsd/os_bsd.cpp -@@ -58,6 +58,7 @@ - #include "runtime/thread.inline.hpp" - #include "runtime/threadCritical.hpp" - #include "runtime/timer.hpp" -+#include "runtime/vm_version.hpp" - #include "services/attachListener.hpp" - #include "services/memTracker.hpp" - #include "services/runtimeService.hpp" @@ -361,7 +361,7 @@ #elif defined(__NetBSD__) #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib" diff --git a/java/openjdk17/files/patch-src_hotspot_share_adlc_formsopt.cpp b/java/openjdk17/files/patch-src_hotspot_share_adlc_formsopt.cpp deleted file mode 100644 index 99ad5c17d8b8..000000000000 --- a/java/openjdk17/files/patch-src_hotspot_share_adlc_formsopt.cpp +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/battleblow/jdk17/pull/1 - ---- src/hotspot/share/adlc/formsopt.cpp.orig 2021-07-23 23:38:59 UTC -+++ src/hotspot/share/adlc/formsopt.cpp -@@ -436,15 +436,20 @@ void AllocClass::output(FILE *fp) { // Write inf - //==============================Frame Handling================================= - //------------------------------FrameForm-------------------------------------- - FrameForm::FrameForm() { -+ _sync_stack_slots = NULL; -+ _inline_cache_reg = NULL; -+ _interpreter_frame_pointer_reg = NULL; -+ _cisc_spilling_operand_name = NULL; - _frame_pointer = NULL; - _c_frame_pointer = NULL; - _alignment = NULL; -+ _return_addr_loc = false; -+ _c_return_addr_loc = false; - _return_addr = NULL; - _c_return_addr = NULL; - _varargs_C_out_slots_killed = NULL; - _return_value = NULL; - _c_return_value = NULL; -- _interpreter_frame_pointer_reg = NULL; - } - - FrameForm::~FrameForm() { |