OpenJDK / zgc / zgc
changeset 6046:fdf63b9f615d
Merge
| author | duke |
|---|---|
| date | Wed, 05 Jul 2017 17:18:25 +0200 |
| parents | a5f45610331b f0252f4d5039 |
| children | a89bf4ed07c9 |
| files | |
| diffstat | 4 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags-top-repo Fri Jul 23 16:42:11 2010 -0700 +++ b/.hgtags-top-repo Wed Jul 05 17:18:25 2017 +0200 @@ -76,3 +76,4 @@ e7f18db469a3e947b7096bfd12e87380e5a042cd jdk7-b99 b218a53ec7d3d42be61d31d6917a6c5c037b6f56 jdk7-b100 4193eaf5f1b82794c6a0fb1a8d11af43d1b1d611 jdk7-b101 +a136a51f5113da4dad3853b74a8536ab583ab112 jdk7-b102
--- a/hotspot/.hgtags Fri Jul 23 16:42:11 2010 -0700 +++ b/hotspot/.hgtags Wed Jul 05 17:18:25 2017 +0200 @@ -106,3 +106,4 @@ ad1977f08c4d69162a0775fe3f9576b9fd521d10 jdk7-b100 6c3a919105b68c15b7db923ec9a00006e9560910 jdk7-b101 ad1977f08c4d69162a0775fe3f9576b9fd521d10 hs19-b03 +c5cadf1a07717955cf60dbaec16e35b529fd2cb0 jdk7-b102
--- a/jdk/.hgtags Fri Jul 23 16:42:11 2010 -0700 +++ b/jdk/.hgtags Wed Jul 05 17:18:25 2017 +0200 @@ -76,3 +76,4 @@ 2587c9f0b60dc3146b4247b8674ada456a643d6f jdk7-b99 820b4e843d5168370a3bf166d19751a3271d8575 jdk7-b100 d58354a69011f3d3354765fa3167567c4c4a9612 jdk7-b101 +13029a61b16bec06535d4f0aa98229b358684128 jdk7-b102
--- a/make/sanity-rules.gmk Fri Jul 23 16:42:11 2010 -0700 +++ b/make/sanity-rules.gmk Wed Jul 05 17:18:25 2017 +0200 @@ -228,7 +228,7 @@ ###################################################### alt_bootdir: ifdef ALT_BOOTDIR - @if [ `$(ECHO) $(subst \,/,$(ALT_BOOTDIR)) | $(EGREP) -ci '^([a-z]:)?/'` -ne 1 ]; then \ + @if [ `$(ECHO) $(subst \,/,$(ALT_BOOTDIR)) | $(EGREP) -c '^([A-Za-z]:)?/'` -ne 1 ]; then \ $(ECHO) "ERROR: ALT_BOOTDIR must be an Absolute Path Name, \n" \ " not a Relative Path Name. \n" \ " The current value of ALT_BOOTDIR is \n" \