From a74cf79db439c07fd93eadba56e324c10c8a84cf Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Wed, 4 Nov 2015 14:06:45 -0800
Subject: [PATCH] 8140630: java/nio/Buffer/Basic.java crashes vm on linux-x64
 using latest devkit to build

Build Bits.c at a lower optimization level on linux-x64.

Reviewed-by: tbell
---
 jdk/make/lib/CoreLibraries.gmk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jdk/make/lib/CoreLibraries.gmk b/jdk/make/lib/CoreLibraries.gmk
index 99f5f752204..01ae7467e5d 100644
--- a/jdk/make/lib/CoreLibraries.gmk
+++ b/jdk/make/lib/CoreLibraries.gmk
@@ -139,6 +139,12 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
   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), \