diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-01-16 13:59:09 +0000 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-01-16 13:59:09 +0000 |
| commit | b3c6e7fecb80d086c9e8d78bc810bd4042caa2a4 (patch) | |
| tree | 7508d0ddf7f2d5227ee29e89d055955e3aee09d2 /java/openjdk12 | |
| parent | java/openjdk11: correctly patch openejdk11 for ppc64 elfv2 (diff) | |
java/openjdk12: correctly patch openjdk12 for ppc64 elfv2
The previous patch didn't check for architecture.
PR: 243183
Notes
Notes:
svn path=/head/; revision=523232
Diffstat (limited to 'java/openjdk12')
| -rw-r--r-- | java/openjdk12/Makefile | 3 | ||||
| -rw-r--r-- | java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/java/openjdk12/Makefile b/java/openjdk12/Makefile index 8b87e603b25c..38b3db29a386 100644 --- a/java/openjdk12/Makefile +++ b/java/openjdk12/Makefile @@ -134,6 +134,9 @@ MAKE_ENV+= USE_CLANG=true CONFIGURE_ARGS+= --disable-warnings-as-errors \ --disable-dtrace .endif +.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 +CONFIGURE_ARGS+= --disable-precompiled-headers +.endif .if ${ARCH} != amd64 CONFIGURE_ARGS+= --enable-aot=no .endif diff --git a/java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 new file mode 100644 index 000000000000..5156c18515da --- /dev/null +++ b/java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 @@ -0,0 +1,13 @@ +--- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 UTC ++++ make/autoconf/flags-cflags.m4 +@@ -770,6 +770,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], + # for all archs except arm and ppc, prevent gcc to omit frame pointer + $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer" + fi ++ elif test "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then ++ if test "x$FLAGS_CPU" = xppc64; then ++ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5" ++ fi + fi + + elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then |