Attachment #219802 for bug #251247

View | Details | Raw Unified | Return to bug 251247
Collapse All | Expand All

Lines 11-17 Link Here

(-)Makefile (-2 / +7 lines)
11		11
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13		13
14	ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64	14	ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le
15		15
16	BUILD_DEPENDS= zip:archivers/zip \	16	BUILD_DEPENDS= zip:archivers/zip \
17	autoconf>0:devel/autoconf \	17	autoconf>0:devel/autoconf \
Lines 193-199 Link Here
193	MAKE_ENV+= LFLAGS="-Wl,-z,notext"	193	MAKE_ENV+= LFLAGS="-Wl,-z,notext"
194	.endif	194	.endif
195		195
196	.if ${ARCH} == amd64 \|\| ${ARCH} == i386 \|\| ${ARCH} == powerpc64	196	.if ${ARCH} == amd64 \|\| ${ARCH} == i386 \|\| ${ARCH:Mpowerpc64*}
197	JDK_BUILD_JVM= server	197	JDK_BUILD_JVM= server
198	.else	198	.else
199	JDK_BUILD_JVM= zero	199	JDK_BUILD_JVM= zero
Lines 224-229 Link Here
224	CONFIGURE_ARGS+= --disable-jfr	224	CONFIGURE_ARGS+= --disable-jfr
225	.endif	225	.endif
226		226
		227	.if ${ARCH} == powerpc64le
		228	CONFIGURE_ARGS+= --disable-jfr
		229	MAKE_ARGS+= USE_PRECOMPILED_HEADER=0
		230	.endif
		231
227	.if empty(ICONV_LIB)	232	.if empty(ICONV_LIB)
228	ICONV_CPPFLAGS= -DLIBICONV_PLUG	233	ICONV_CPPFLAGS= -DLIBICONV_PLUG
229	.else	234	.else

Line 0 Link Here

(-)files/patch-hotspot_make_bsd_makefiles_ppc64.make (+9 lines)
	1	--- hotspot/make/bsd/makefiles/ppc64.make.orig 2020-11-18 23:45:09 UTC
	2	+++ hotspot/make/bsd/makefiles/ppc64.make
	3	@@ -47,5 +47,5 @@ else
	4	CFLAGS += -DVM_LITTLE_ENDIAN -DABI_ELFv2
	5
	6	# Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
	7	- CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple -mno-string
	8	+ CFLAGS += -mcpu=power8 -mtune=power8
	9	endif




--- hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp.orig	2020-11-18 23:50:31 UTC
+++ hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp
@@ -27,13 +27,13 @@
 #define OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP
 
 #if defined(VM_LITTLE_ENDIAN)
-#include <byteswap.h>
+#include <sys/endian.h>
 
 // Efficient swapping of data bytes from Java byte
 // ordering to native byte ordering and vice versa.
-inline u2 Bytes::swap_u2(u2 x) { return bswap_16(x); }
-inline u4 Bytes::swap_u4(u4 x) { return bswap_32(x); }
-inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); }
+inline u2 Bytes::swap_u2(u2 x) { return bswap16(x); }
+inline u4 Bytes::swap_u4(u4 x) { return bswap32(x); }
+inline u8 Bytes::swap_u8(u8 x) { return bswap64(x); }
 #endif // VM_LITTLE_ENDIAN
 
 #endif // OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP

Return to bug 251247

Line 0 Link Here

(-)files/patch-hotspot_src_os__cpu_bsd__ppc_vm_bytes__bsd__ppc.inline.hpp (+20 lines)
	1	--- hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp.orig 2020-11-18 23:50:31 UTC
	2	+++ hotspot/src/os_cpu/bsd_ppc/vm/bytes_bsd_ppc.inline.hpp
	3	@@ -27,13 +27,13 @@
	4	#define OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP
	5
	6	#if defined(VM_LITTLE_ENDIAN)
	7	-#include <byteswap.h>
	8	+#include <sys/endian.h>
	9
	10	// Efficient swapping of data bytes from Java byte
	11	// ordering to native byte ordering and vice versa.
	12	-inline u2 Bytes::swap_u2(u2 x) { return bswap_16(x); }
	13	-inline u4 Bytes::swap_u4(u4 x) { return bswap_32(x); }
	14	-inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); }
	15	+inline u2 Bytes::swap_u2(u2 x) { return bswap16(x); }
	16	+inline u4 Bytes::swap_u4(u4 x) { return bswap32(x); }
	17	+inline u8 Bytes::swap_u8(u8 x) { return bswap64(x); }
	18	#endif // VM_LITTLE_ENDIAN
	19
	20	#endif // OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP