diff mbox

RFR: jdk8: work around problem with gcc 4.8.x

Message ID 1410955058.2899.14.camel@localhost.localdomain
State New
Headers show

Commit Message

Edward Nevill Sept. 17, 2014, 11:57 a.m. UTC
Hi,

The following patch works around a problem with gcc 4.8.x compiling ciEnv.cpp,

OK to push in jdk8?
Ed.

--- CUT HERE ---
# HG changeset patch
# User Edward Nevill edward.nevill@linaro.org
# Date 1410954800 -3600
#      Wed Sep 17 12:53:20 2014 +0100
# Node ID 05c84f4cec3e49b04ce42faa0995da5dd254665a
# Parent  a6df78e590bb97446250ac5466f5d59a86161c43
Work around problem with gcc 4.8.x

Comments

Andrew Haley Sept. 17, 2014, 12:03 p.m. UTC | #1
On 09/17/2014 12:57 PM, Edward Nevill wrote:
> The following patch works around a problem with gcc 4.8.x compiling ciEnv.cpp,
> 
> OK to push in jdk8?

Argh.  Okay.  But I really don't want pushes to just one repo: everyone
needs it, 7, 8, and 9, or none do.

Andrew.
diff mbox

Patch

diff -r a6df78e590bb -r 05c84f4cec3e make/linux/makefiles/gcc.make
--- a/make/linux/makefiles/gcc.make	Wed Sep 10 10:42:58 2014 -0400
+++ b/make/linux/makefiles/gcc.make	Wed Sep 17 12:53:20 2014 +0100
@@ -267,6 +267,12 @@ 
   ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 3), 1)
     OPT_CFLAGS/mulnode.o += $(OPT_CFLAGS/NOOPT)
   endif
+  # Work around problem with 4.8 series building ciEnv on aarch64
+  ifeq ($(BUILDARCH), aarch64)
+    ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 8), 1)
+      OPT_CFLAGS/ciEnv.o += $(OPT_CFLAGS/NOOPT)
+    endif
+  endif
 endif
 
 # Flags for generating make dependency flags.
--- CUT HERE ---