Mercurial > hg > truffle

changeset 20692:bc5a90a4db47 hs25.40-b22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Fri, 05 Dec 2014 09:47:13 -0800
parents 0d749db61a36 (diff) 03b7d9efd9fd (current diff)
children 31d3306aad29
files make/jprt.properties
diffstat 5 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Dec 04 07:54:25 2014 +0000
+++ b/.hgtags	Fri Dec 05 09:47:13 2014 -0800
@@ -558,3 +558,4 @@
 aa2442f89230dc46147c721812f3b3bd4c612e83 hs25.40-b20
 5ea68fb91139081304357f9b937f32c5fdfeca6d jdk8u40-b16
 6bf89bfe8185747a57193efb6cec1f17ccc80414 hs25.40-b21
+fc1f9b67fd8c5d5cd94ecc03569d93e7ce7fb574 jdk8u40-b17
--- a/make/aix/makefiles/adjust-mflags.sh	Thu Dec 04 07:54:25 2014 +0000
+++ b/make/aix/makefiles/adjust-mflags.sh	Fri Dec 05 09:47:13 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}}'/
--- a/make/bsd/makefiles/adjust-mflags.sh	Thu Dec 04 07:54:25 2014 +0000
+++ b/make/bsd/makefiles/adjust-mflags.sh	Fri Dec 05 09:47:13 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}}'/
--- a/make/linux/makefiles/adjust-mflags.sh	Thu Dec 04 07:54:25 2014 +0000
+++ b/make/linux/makefiles/adjust-mflags.sh	Fri Dec 05 09:47:13 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}}'/
--- a/make/solaris/makefiles/adjust-mflags.sh	Thu Dec 04 07:54:25 2014 +0000
+++ b/make/solaris/makefiles/adjust-mflags.sh	Fri Dec 05 09:47:13 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}}'/