Mercurial > hg > openjdk > aarch64-port > hotspot

changeset 7552:2fb893b1a255

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author aph
date Mon, 22 Sep 2014 05:24:02 -0400
parents 07ecc743c580 (current diff) 05c84f4cec3e (diff)
children 3fd0a587111e
files
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/linux/makefiles/gcc.make	Wed Sep 17 04:04:58 2014 -0400
+++ b/make/linux/makefiles/gcc.make	Mon Sep 22 05:24:02 2014 -0400
@@ -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.