From cd1589f6ca7167b13abfe6b6473c046847dfdfad Mon Sep 17 00:00:00 2001 From: MBaesken Date: Thu, 23 Jan 2025 13:56:48 +0100 Subject: [PATCH 1/3] JDK-8348207 --- make/hotspot/lib/JvmOverrideFiles.gmk | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk index 6a513e10c61d4..42193b109eb0e 100644 --- a/make/hotspot/lib/JvmOverrideFiles.gmk +++ b/make/hotspot/lib/JvmOverrideFiles.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -52,16 +52,14 @@ ifneq ($(FDLIBM_CFLAGS), ) endif ifeq ($(call isTargetOs, linux), true) - BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG) - BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG) + BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG) + BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG) - ifeq ($(TOOLCHAIN_TYPE), clang) - JVM_PRECOMPILED_HEADER_EXCLUDE := \ - sharedRuntimeTrig.cpp \ - sharedRuntimeTrans.cpp \ - $(OPT_SPEED_SRC) \ - # - endif + JVM_PRECOMPILED_HEADER_EXCLUDE := \ + sharedRuntimeTrig.cpp \ + sharedRuntimeTrans.cpp \ + $(OPT_SPEED_SRC) \ + # ifeq ($(call isTargetCpu, x86), true) # Performance measurements show that by compiling GC related code, we could From a750c2a2cd25ab6e82da44df0ae064750a70fcf7 Mon Sep 17 00:00:00 2001 From: MBaesken Date: Fri, 24 Jan 2025 15:51:56 +0100 Subject: [PATCH 2/3] adjust gcc PCH exclusion on ppc64le --- make/hotspot/lib/JvmOverrideFiles.gmk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk index 42193b109eb0e..4290196e1fa1e 100644 --- a/make/hotspot/lib/JvmOverrideFiles.gmk +++ b/make/hotspot/lib/JvmOverrideFiles.gmk @@ -55,11 +55,21 @@ ifeq ($(call isTargetOs, linux), true) BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG) BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG) - JVM_PRECOMPILED_HEADER_EXCLUDE := \ + ifeq ($(TOOLCHAIN_TYPE), clang) + JVM_PRECOMPILED_HEADER_EXCLUDE := \ sharedRuntimeTrig.cpp \ sharedRuntimeTrans.cpp \ $(OPT_SPEED_SRC) \ # + endif + + ifeq ($(call isTargetCpu, ppc64le)+$(TOOLCHAIN_TYPE), true+gcc) + JVM_PRECOMPILED_HEADER_EXCLUDE := \ + sharedRuntimeTrig.cpp \ + sharedRuntimeTrans.cpp \ + $(OPT_SPEED_SRC) \ + # + endif ifeq ($(call isTargetCpu, x86), true) # Performance measurements show that by compiling GC related code, we could From 31e1a03839c4bc222087d7e1441d6a869466f85f Mon Sep 17 00:00:00 2001 From: MBaesken Date: Mon, 27 Jan 2025 08:52:06 +0100 Subject: [PATCH 3/3] adjust indentation --- make/hotspot/lib/JvmOverrideFiles.gmk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk index 4290196e1fa1e..20776afded8e3 100644 --- a/make/hotspot/lib/JvmOverrideFiles.gmk +++ b/make/hotspot/lib/JvmOverrideFiles.gmk @@ -57,18 +57,18 @@ ifeq ($(call isTargetOs, linux), true) ifeq ($(TOOLCHAIN_TYPE), clang) JVM_PRECOMPILED_HEADER_EXCLUDE := \ - sharedRuntimeTrig.cpp \ - sharedRuntimeTrans.cpp \ - $(OPT_SPEED_SRC) \ - # + sharedRuntimeTrig.cpp \ + sharedRuntimeTrans.cpp \ + $(OPT_SPEED_SRC) \ + # endif ifeq ($(call isTargetCpu, ppc64le)+$(TOOLCHAIN_TYPE), true+gcc) JVM_PRECOMPILED_HEADER_EXCLUDE := \ - sharedRuntimeTrig.cpp \ - sharedRuntimeTrans.cpp \ - $(OPT_SPEED_SRC) \ - # + sharedRuntimeTrig.cpp \ + sharedRuntimeTrans.cpp \ + $(OPT_SPEED_SRC) \ + # endif ifeq ($(call isTargetCpu, x86), true)