Mercurial > hg > graal-jvmci-8
changeset 20674:fc1f9b67fd8c jdk8u40-b17
Merge
author | amurillo |
---|---|
date | Tue, 02 Dec 2014 09:50:33 -0800 |
parents | 3562db849018 (diff) 01de5cfa06c1 (current diff) |
children | 0d749db61a36 ea6dbaa4bf8e |
files | |
diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/aix/makefiles/adjust-mflags.sh Thu Nov 27 09:48:34 2014 -0800 +++ b/make/aix/makefiles/adjust-mflags.sh Tue Dec 02 09:50:33 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 Nov 27 09:48:34 2014 -0800 +++ b/make/bsd/makefiles/adjust-mflags.sh Tue Dec 02 09:50:33 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 Nov 27 09:48:34 2014 -0800 +++ b/make/linux/makefiles/adjust-mflags.sh Tue Dec 02 09:50:33 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 Nov 27 09:48:34 2014 -0800 +++ b/make/solaris/makefiles/adjust-mflags.sh Tue Dec 02 09:50:33 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}}'/