0c4d834e94
Resolves: RHBZ#1630426
23 lines
937 B
Diff
23 lines
937 B
Diff
diff --git openjdk.orig/hotspot/make/linux/makefiles/aarch64.make openjdk/hotspot/make/linux/makefiles/aarch64.make
|
|
index 3d17326..7cdb498 100644
|
|
--- openjdk.orig/hotspot/make/linux/makefiles/aarch64.make
|
|
+++ openjdk/hotspot/make/linux/makefiles/aarch64.make
|
|
@@ -22,10 +22,13 @@
|
|
#
|
|
#
|
|
|
|
-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
|
|
-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
|
|
-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
|
|
-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
|
|
+ifeq ($(OPT_CFLAGS_NO_FMA),)
|
|
+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
|
|
+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
|
|
+else
|
|
+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
|
|
+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
|
|
+endif
|
|
# Must also specify if CPU is little endian
|
|
CFLAGS += -DVM_LITTLE_ENDIAN
|
|
|