diff options
author | Greg Lewis <glewis@FreeBSD.org> | 2022-08-01 21:15:45 -0700 |
---|---|---|
committer | Greg Lewis <glewis@FreeBSD.org> | 2022-08-01 21:15:45 -0700 |
commit | 8efb59db35f1d89bbd66e1b6ea5dbcbe99a611b2 (patch) | |
tree | 1878094720a1e0f2ec08c22835d4b998547d05ae /java/openjdk8/files | |
parent | sysutils/py-diffoscope: Update to 220 (diff) |
java/openjdk8: Update to 8u342
Diffstat (limited to 'java/openjdk8/files')
-rw-r--r-- | java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp | 14 | ||||
-rw-r--r-- | java/openjdk8/files/patch-make-common-MakeBase.gmk | 14 |
2 files changed, 0 insertions, 28 deletions
diff --git a/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp b/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp deleted file mode 100644 index 0495a62ccb3b..000000000000 --- a/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp +++ /dev/null @@ -1,14 +0,0 @@ ---- hotspot/src/cpu/aarch64/vm/pauth_aarch64.hpp -+++ hotspot/src/cpu/aarch64/vm/pauth_aarch64.hpp -@@ -25,7 +25,11 @@ - #ifndef CPU_AARCH64_PAUTH_AARCH64_INLINE_HPP - #define CPU_AARCH64_PAUTH_AARCH64_INLINE_HPP - -+#if defined(LINUX) - #include "pauth_linux_aarch64.inline.hpp" -+#elif defined(_ALLBSD_SOURCE) -+#include "pauth_bsd_aarch64.inline.hpp" -+#endif - - inline bool pauth_ptr_is_raw(address ptr) { - // Confirm none of the high bits are set in the pointer. diff --git a/java/openjdk8/files/patch-make-common-MakeBase.gmk b/java/openjdk8/files/patch-make-common-MakeBase.gmk deleted file mode 100644 index b7a7ffaa719e..000000000000 --- a/java/openjdk8/files/patch-make-common-MakeBase.gmk +++ /dev/null @@ -1,14 +0,0 @@ ---- make/common/MakeBase.gmk.orig 2022-05-04 18:19:33.661930000 -0700 -+++ make/common/MakeBase.gmk 2022-05-04 18:19:45.573627000 -0700 -@@ -318,11 +318,6 @@ - # Emit the scm:id pair to $@ - define GetSourceTips - $(CD) $(SRC_ROOT) ; \ -- if [ -d $(SCM_DIR) -a "$(SCM_VERSION)" != "" ] ; then \ -- $(ID_COMMAND) >> $@ ; \ -- elif [ -f $(SCM_TIP_FILENAME) ] ; then \ -- $(SCM_TIP_FILECMD) >> $@ ; \ -- fi; - $(PRINTF) "\n" >> $@ - endef - |