openjdk team mailing list archive

[John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>]

Source: openjdk-12
Version: 12~24-2
Severity: normal
Tags: patch upstream
User: debian-sparc@xxxxxxxxxxxxxxxx
Usertags: sparc64

Hi!

The attached patch fixes Zero on linux-sparc64, see [1].

Thanks,
Adrian

> [1] http://mail.openjdk.java.net/pipermail/hotspot-dev/2018-December/035950.html

--
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@xxxxxxxxxx
`. `'   Freie Universitaet Berlin - glaubitz@xxxxxxxxxxxxxxxxxxx
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913

>From 7ce2609d6ff5299f2ed3ff6850a3cab4a16125f8 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 21 Dec 2018 15:18:17 +0300
Subject: [PATCH] Don't optimize fdlibm-fork for Zero on linux-sparc (Zero)

---
 make/hotspot/lib/JvmOverrideFiles.gmk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
index 7d45dd331a..79c014e82a 100644
--- a/make/hotspot/lib/JvmOverrideFiles.gmk
+++ b/make/hotspot/lib/JvmOverrideFiles.gmk
@@ -49,6 +49,15 @@ LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)
 # by using -ffp-contract=off on GCC/Clang platforms.
 ifneq ($(FDLIBM_CFLAGS), )
   LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NORM)
+  # Don't optimize fdlibm-fork for Zero on Linux sparc
+  # See JDK-XXXX
+  ifeq ($(call check-jvm-feature, zero), true)
+    ifeq ($(OPENJDK_TARGET_OS), linux)
+      ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
+        LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)
+      endif
+    endif
+  endif
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), linux)
-- 
2.19.1