# HG changeset patch
# User amurillo
# Date 1416937574 28800
# Node ID 280a67db7427bea2dc3ca94ef9b717b44b8872fb
# Parent  5ea68fb91139081304357f9b937f32c5fdfeca6d# Parent  ba05b10dea7e3c9e819c76e7937aed3a002b6dfd
Merge

diff -r 5ea68fb91139 -r 280a67db7427 make/aix/makefiles/adjust-mflags.sh
--- a/make/aix/makefiles/adjust-mflags.sh	Fri Nov 21 10:19:20 2014 -0800
+++ b/make/aix/makefiles/adjust-mflags.sh	Tue Nov 25 09:46:14 2014 -0800
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -64,7 +64,7 @@
 	echo "$MFLAGS" \
 	| sed '
 		s/^-/ -/
-		s/ -\([^ 	][^ 	]*\)j/ -\1 -j/
+		s/ -\([^ 	I][^ 	I]*\)j/ -\1 -j/
 		s/ -j[0-9][0-9]*/ -j/
 		s/ -j\([^ 	]\)/ -j -\1/
 		s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
diff -r 5ea68fb91139 -r 280a67db7427 make/bsd/makefiles/adjust-mflags.sh
--- a/make/bsd/makefiles/adjust-mflags.sh	Fri Nov 21 10:19:20 2014 -0800
+++ b/make/bsd/makefiles/adjust-mflags.sh	Tue Nov 25 09:46:14 2014 -0800
@@ -64,7 +64,7 @@
 	echo "$MFLAGS" \
 	| sed '
 		s/^-/ -/
-		s/ -\([^ 	][^ 	]*\)j/ -\1 -j/
+		s/ -\([^ 	I][^ 	I]*\)j/ -\1 -j/
 		s/ -j[0-9][0-9]*/ -j/
 		s/ -j\([^ 	]\)/ -j -\1/
 		s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
diff -r 5ea68fb91139 -r 280a67db7427 make/linux/makefiles/adjust-mflags.sh
--- a/make/linux/makefiles/adjust-mflags.sh	Fri Nov 21 10:19:20 2014 -0800
+++ b/make/linux/makefiles/adjust-mflags.sh	Tue Nov 25 09:46:14 2014 -0800
@@ -64,7 +64,7 @@
 	echo "$MFLAGS" \
 	| sed '
 		s/^-/ -/
-		s/ -\([^ 	][^ 	]*\)j/ -\1 -j/
+		s/ -\([^ 	I][^ 	I]*\)j/ -\1 -j/
 		s/ -j[0-9][0-9]*/ -j/
 		s/ -j\([^ 	]\)/ -j -\1/
 		s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
diff -r 5ea68fb91139 -r 280a67db7427 make/solaris/makefiles/adjust-mflags.sh
--- a/make/solaris/makefiles/adjust-mflags.sh	Fri Nov 21 10:19:20 2014 -0800
+++ b/make/solaris/makefiles/adjust-mflags.sh	Tue Nov 25 09:46:14 2014 -0800
@@ -64,7 +64,7 @@
 	echo "$MFLAGS" \
 	| sed '
 		s/^-/ -/
-		s/ -\([^ 	][^ 	]*\)j/ -\1 -j/
+		s/ -\([^ 	I][^ 	I]*\)j/ -\1 -j/
 		s/ -j[0-9][0-9]*/ -j/
 		s/ -j\([^ 	]\)/ -j -\1/
 		s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/