Date: Wed, 24 Jul 2019 23:29:39 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507305 - head/java/openjdk8/files Message-ID: <201907242329.x6ONTdbE051509@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Wed Jul 24 23:29:39 2019 New Revision: 507305 URL: https://svnweb.freebsd.org/changeset/ports/507305 Log: Fix the build for powerpc64 PR: 239368 Submitted by: pkubaj Added: head/java/openjdk8/files/patch-hotspot_agent_src_os_bsd_ps__proc.c (contents, props changed) head/java/openjdk8/files/patch-hotspot_src_cpu_ppc_vm_stubGenerator__ppc.cpp (contents, props changed) Added: head/java/openjdk8/files/patch-hotspot_agent_src_os_bsd_ps__proc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk8/files/patch-hotspot_agent_src_os_bsd_ps__proc.c Wed Jul 24 23:29:39 2019 (r507305) @@ -0,0 +1,12 @@ +--- hotspot/agent/src/os/bsd/ps_proc.c.orig 2019-07-21 20:24:28 UTC ++++ hotspot/agent/src/os/bsd/ps_proc.c +@@ -27,8 +27,8 @@ + #include <stdlib.h> + #include <string.h> + #include <errno.h> +-#include <sys/sysctl.h> + #include <sys/types.h> ++#include <sys/sysctl.h> + #include <sys/wait.h> + #include <sys/ptrace.h> + #include <sys/param.h> Added: head/java/openjdk8/files/patch-hotspot_src_cpu_ppc_vm_stubGenerator__ppc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk8/files/patch-hotspot_src_cpu_ppc_vm_stubGenerator__ppc.cpp Wed Jul 24 23:29:39 2019 (r507305) @@ -0,0 +1,155 @@ +--- hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp.orig 2019-07-22 16:46:38 UTC ++++ hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp +@@ -1212,12 +1212,6 @@ class StubGenerator: public StubCodeGenerator { + // Prefetch the data into the L2 cache. + __ dcbt(R3_ARG1, 0); + +- // If supported set DSCR pre-fetch to deepest. +- if (VM_Version::has_mfdscr()) { +- __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7); +- __ mtdscr(tmp2); +- } +- + __ li(tmp1, 16); + + // Backbranch target aligned to 32-byte. Not 16-byte align as +@@ -1236,12 +1230,6 @@ class StubGenerator: public StubCodeGenerator { + __ addi(R4_ARG2, R4_ARG2, 32); // Update dsc+=32 + __ bdnz(l_10); // Dec CTR and loop if not zero. + +- // Restore DSCR pre-fetch value. +- if (VM_Version::has_mfdscr()) { +- __ load_const_optimized(tmp2, VM_Version::_dscr_val); +- __ mtdscr(tmp2); +- } +- + } // VSX + } // FasterArrayCopy + +@@ -1481,11 +1469,6 @@ class StubGenerator: public StubCodeGenerator { + // Prefetch src data into L2 cache. + __ dcbt(R3_ARG1, 0); + +- // If supported set DSCR pre-fetch to deepest. +- if (VM_Version::has_mfdscr()) { +- __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7); +- __ mtdscr(tmp2); +- } + __ li(tmp1, 16); + + // Backbranch target aligned to 32-byte. It's not aligned 16-byte +@@ -1504,12 +1487,6 @@ class StubGenerator: public StubCodeGenerator { + __ addi(R4_ARG2, R4_ARG2, 32); // Update dsc+=32. + __ bdnz(l_9); // Dec CTR and loop if not zero. + +- // Restore DSCR pre-fetch value. +- if (VM_Version::has_mfdscr()) { +- __ load_const_optimized(tmp2, VM_Version::_dscr_val); +- __ mtdscr(tmp2); +- } +- + } + } // FasterArrayCopy + __ bind(l_6); +@@ -1674,12 +1651,6 @@ class StubGenerator: public StubCodeGenerator { + // Prefetch the data into the L2 cache. + __ dcbt(R3_ARG1, 0); + +- // If supported set DSCR pre-fetch to deepest. +- if (VM_Version::has_mfdscr()) { +- __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7); +- __ mtdscr(tmp2); +- } +- + __ li(tmp1, 16); + + // Backbranch target aligned to 32-byte. Not 16-byte align as +@@ -1698,12 +1669,6 @@ class StubGenerator: public StubCodeGenerator { + __ addi(R4_ARG2, R4_ARG2, 32); // Update dsc+=32 + __ bdnz(l_7); // Dec CTR and loop if not zero. + +- // Restore DSCR pre-fetch value. +- if (VM_Version::has_mfdscr()) { +- __ load_const_optimized(tmp2, VM_Version::_dscr_val); +- __ mtdscr(tmp2); +- } +- + } // VSX + } // FasterArrayCopy + +@@ -1821,12 +1786,6 @@ class StubGenerator: public StubCodeGenerator { + // Prefetch the data into the L2 cache. + __ dcbt(R3_ARG1, 0); + +- // If supported set DSCR pre-fetch to deepest. +- if (VM_Version::has_mfdscr()) { +- __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7); +- __ mtdscr(tmp2); +- } +- + __ li(tmp1, 16); + + // Backbranch target aligned to 32-byte. Not 16-byte align as +@@ -1845,11 +1804,6 @@ class StubGenerator: public StubCodeGenerator { + __ stxvd2x(tmp_vsr1, R4_ARG2); // Store to dst + __ bdnz(l_4); + +- // Restore DSCR pre-fetch value. +- if (VM_Version::has_mfdscr()) { +- __ load_const_optimized(tmp2, VM_Version::_dscr_val); +- __ mtdscr(tmp2); +- } + } + + __ cmpwi(CCR0, R5_ARG3, 0); +@@ -1949,12 +1903,6 @@ class StubGenerator: public StubCodeGenerator { + // Prefetch the data into the L2 cache. + __ dcbt(R3_ARG1, 0); + +- // If supported set DSCR pre-fetch to deepest. +- if (VM_Version::has_mfdscr()) { +- __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7); +- __ mtdscr(tmp2); +- } +- + __ li(tmp1, 16); + + // Backbranch target aligned to 32-byte. Not 16-byte align as +@@ -1973,12 +1921,6 @@ class StubGenerator: public StubCodeGenerator { + __ addi(R4_ARG2, R4_ARG2, 32); // Update dsc+=32 + __ bdnz(l_5); // Dec CTR and loop if not zero. + +- // Restore DSCR pre-fetch value. +- if (VM_Version::has_mfdscr()) { +- __ load_const_optimized(tmp2, VM_Version::_dscr_val); +- __ mtdscr(tmp2); +- } +- + } // VSX + } // FasterArrayCopy + +@@ -2074,12 +2016,6 @@ class StubGenerator: public StubCodeGenerator { + // Prefetch the data into the L2 cache. + __ dcbt(R3_ARG1, 0); + +- // If supported set DSCR pre-fetch to deepest. +- if (VM_Version::has_mfdscr()) { +- __ load_const_optimized(tmp2, VM_Version::_dscr_val | 7); +- __ mtdscr(tmp2); +- } +- + __ li(tmp1, 16); + + // Backbranch target aligned to 32-byte. Not 16-byte align as +@@ -2098,11 +2034,6 @@ class StubGenerator: public StubCodeGenerator { + __ stxvd2x(tmp_vsr1, R4_ARG2); // Store to dst + __ bdnz(l_4); + +- // Restore DSCR pre-fetch value. +- if (VM_Version::has_mfdscr()) { +- __ load_const_optimized(tmp2, VM_Version::_dscr_val); +- __ mtdscr(tmp2); +- } + } + + __ cmpwi(CCR0, R5_ARG3, 0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907242329.x6ONTdbE051509>