From ac8579d7f83142fe39bd6455010a69e4add494cf Mon Sep 17 00:00:00 2001 From: David Holmes Date: Tue, 29 Nov 2011 00:26:22 -0500 Subject: [PATCH] 7109092: Wrong computation results with double at armsflt Need to link to custom soft-float library with required FP accuracy Reviewed-by: alanb, ohair --- jdk/make/common/Defs-embedded.gmk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jdk/make/common/Defs-embedded.gmk b/jdk/make/common/Defs-embedded.gmk index de449f82b5a..089fae9d586 100644 --- a/jdk/make/common/Defs-embedded.gmk +++ b/jdk/make/common/Defs-embedded.gmk @@ -65,5 +65,12 @@ ifdef CROSS_COMPILE_ARCH NIO_PLATFORM_CLASSES_ROOT_DIR = $(CLOSED_PLATFORM_SRC)/classes/ endif +# For ARM sflt we need to link to a library with improved FP accuracy +# and it must be linked after fdlibm - this places it at the end after libc +# -z muldefs avoids linker errors for duplicate symbols. +ifeq ($(CROSS_COMPILE_ARCH), arm) + EXTRA_LIBS += $(EXT_LIBS_PATH)/sflt_glibc_jdk.a -Xlinker -z -Xlinker muldefs +endif + endif # JAVASE_EMBEDDED