pool/java-1_8_0-openjdk
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=285

Browse Source
This commit is contained in:
Fridrich Strba 2018-06-01 14:08:32 +00:00 committed by Git OBS Bridge
parent b1c90c32a1
commit 5ff1ff4b6b
3 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java-1_8_0-openjdk.changes
View File

@ -217,6 +217,7 @@ Fri Jun 1 12:14:41 UTC 2018 - fstrba@suse.com
+ PR3548: Add missing return values for AArch32 port
- Removed patches:
* no-return-in-nonvoid-function.patch
* zero-atomic_copy64.patch
+ fixed upstream
* java-1_8_0-openjdk-gcc6.patch
+ not needed any more

2
java-1_8_0-openjdk.spec
View File

@ -192,7 +192,6 @@ Patch3: java-atk-wrapper-security.patch
Patch12: adlc-parser.patch
# Avoid triggering inactivity timeout while generating javadoc in zero VM
Patch14: zero-javadoc-verbose.patch
Patch15: zero-atomic_copy64.patch
#
# OpenJDK specific patches
#
@ -537,7 +536,6 @@ patch -p0 -i %{PATCH12}
%if %{with zero}
patch -p0 -i %{PATCH14}
patch -p0 -i %{PATCH15}
%endif
%ifarch ppc ppc64 ppc64le

29
zero-atomic_copy64.patch
View File

@ -1,29 +0,0 @@
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2017-08-31 16:35:40.546293657 +0200
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2017-08-31 16:39:53.186297970 +0200
@@ -36,18 +36,19 @@
// Atomically copy 64 bits of data
static void atomic_copy64(volatile void *src, volatile void *dst) {
-#if defined(PPC32)
+#if defined(PPC32) && !defined(__NO_FPRS__)
double tmp;
- asm volatile ("lfd %0, 0(%1)\n"
- "stfd %0, 0(%2)\n"
- : "=f"(tmp)
- : "b"(src), "b"(dst));
+ asm volatile ("lfd %0, %2\n"
+ "stfd %0, %1\n"
+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
+ : "Q"(*(volatile double*)src));
#elif defined(S390) && !defined(_LP64)
double tmp;
asm volatile ("ld %0, 0(%1)\n"
"std %0, 0(%2)\n"
- : "=r"(tmp)
- : "a"(src), "a"(dst));
+ : "=&r"(tmp)
+ : "a"(src), "a"(dst)
+ : "memory");
#else
*(jlong *) dst = *(jlong *) src;
#endif