diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2021-07-30 22:00:51 -0700 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2021-07-30 22:00:51 -0700 |
| commit | b16d9d899f3d9a3a7be7559cda78b74120918e22 (patch) | |
| tree | cd04e66f1d117b04d412eb82f2c63b0de2328d1d /java/openjdk13/files | |
| parent | games/el: update to 1.9.5.9 (diff) | |
java/openjdk13: Update to 13.0.8
Diffstat (limited to 'java/openjdk13/files')
3 files changed, 0 insertions, 66 deletions
diff --git a/java/openjdk13/files/patch-commit-c484d890428 b/java/openjdk13/files/patch-commit-c484d890428 deleted file mode 100644 index 39ac7a7e8e46..000000000000 --- a/java/openjdk13/files/patch-commit-c484d890428 +++ /dev/null @@ -1,23 +0,0 @@ -commit c484d8904285652246c3af212a4211b9a8955149 -Author: Thomas Stuefe <stuefe@openjdk.org> -Date: Tue Mar 16 05:49:01 2021 +0000 - - 8263557: Possible NULL dereference in Arena::destruct_contents() - - Reviewed-by: kbarrett, coleenp - -diff --git src/hotspot/share/memory/arena.cpp src/hotspot/share/memory/arena.cpp -index 8388f68c359..16059bed9be 100644 ---- src/hotspot/share/memory/arena.cpp -+++ src/hotspot/share/memory/arena.cpp -@@ -310,7 +310,9 @@ void Arena::destruct_contents() { - // reset size before chop to avoid a rare racing condition - // that can have total arena memory exceed total chunk memory - set_size_in_bytes(0); -- _first->chop(); -+ if (_first != NULL) { -+ _first->chop(); -+ } - reset(); - } - diff --git a/java/openjdk13/files/patch-commit-f8a9602a0a6 b/java/openjdk13/files/patch-commit-f8a9602a0a6 deleted file mode 100644 index 3222f6ceb871..000000000000 --- a/java/openjdk13/files/patch-commit-f8a9602a0a6 +++ /dev/null @@ -1,28 +0,0 @@ -commit f8a9602a0a65cdc98eb940aac9529256ded2bf42 -Author: Yasumasa Suenaga <ysuenaga@openjdk.org> -Date: Thu Jan 21 06:08:13 2021 +0000 - - 8260025: Missing comma in VM_Version_Ext::_family_id_amd - - Reviewed-by: dholmes, stuefe - -diff --git src/hotspot/cpu/x86/vm_version_ext_x86.cpp src/hotspot/cpu/x86/vm_version_ext_x86.cpp -index 30d9494c654..a84b37f7977 100644 ---- src/hotspot/cpu/x86/vm_version_ext_x86.cpp -+++ src/hotspot/cpu/x86/vm_version_ext_x86.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -739,7 +739,7 @@ const char* const VM_Version_Ext::_family_id_amd[ExtendedFamilyIdLength_AMD] = { - "", - "", - "Opteron/Athlon64", -- "Opteron QC/Phenom" // Barcelona et.al. -+ "Opteron QC/Phenom", // Barcelona et.al. - "", - "", - "", diff --git a/java/openjdk13/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp b/java/openjdk13/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp deleted file mode 100644 index e89a35822d97..000000000000 --- a/java/openjdk13/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- src/hotspot/cpu/aarch64/vm_version_aarch64.cpp -+++ src/hotspot/cpu/aarch64/vm_version_aarch64.cpp -@@ -34,8 +34,12 @@ - - #include OS_HEADER_INLINE(os) - -+#if defined(__linux__) - #include <sys/auxv.h> - #include <asm/hwcap.h> -+#elif defined(__FreeBSD__) -+#include <machine/elf.h> -+#endif - - #ifndef HWCAP_ASIMD - #define HWCAP_ASIMD (1<<1) |
