--- a/jdk/make/lib/CoreLibraries.gmk	Wed Nov 04 11:27:58 2015 -0800
+++ b/jdk/make/lib/CoreLibraries.gmk	Wed Nov 04 14:06:45 2015 -0800
@@ -139,6 +139,12 @@
   endif
 endif
 
+ifeq ($(OPENJDK_TARGET_OS), linux)
+  ifeq ($(OPENJDK_TARGET_CPU), x86_64)
+    BUILD_LIBJAVA_Bits.c_CFLAGS := $(C_O_FLAG_NORM)
+  endif
+endif
+
 $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
     LIBRARY := java, \
     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \