[GR-32410] Merge in jdk-11.0.13+7.

PullRequest: labsjdk-ce-11/210
graalvm · Sep 30, 2021 · 818477a · 818477a
2 parents 8274b63 + 3f82143
commit 818477a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -4242,6 +4242,7 @@ void MacroAssembler::adrp(Register reg1, const Address &dest, uint64_t &byte_off
  uint64_t adrp_target
  = (target & 0xffffffffULL) | ((uint64_t)pc() & 0xffff00000000ULL);
 
+ _adrp(reg1, (address)adrp_target);
  movk(reg1, target >> 32, 32);
  }
  byte_offset = (uint64_t)dest.target() & 0xfff;

diff --git a/src/java.base/macosx/native/libjava/java_props_macosx.c b/src/java.base/macosx/native/libjava/java_props_macosx.c
@@ -254,6 +254,7 @@ void setOSNameAndVersion(java_props_t *sprops) {
  // Hardcode os_name, and fill in os_version
  sprops->os_name = strdup("Mac OS X");
 
+ NSString *nsVerStr = NULL;
  char* osVersionCStr = NULL;
  // Mac OS 10.9 includes the [NSProcessInfo operatingSystemVersion] function,
  // but it's not in the 10.9 SDK. So, call it via NSInvocation.
@@ -266,7 +267,6 @@ void setOSNameAndVersion(java_props_t *sprops) {
  [invoke invokeWithTarget:[NSProcessInfo processInfo]];
  [invoke getReturnValue:&osVer];
 
- NSString *nsVerStr;
  // Copy out the char* if running on version other than 10.16 Mac OS (10.16 == 11.x)
  // or explicitly requesting version compatibility
  if (!((long)osVer.majorVersion == 10 && (long)osVer.minorVersion >= 16) ||
@@ -278,36 +278,30 @@ void setOSNameAndVersion(java_props_t *sprops) {
  nsVerStr = [NSString stringWithFormat:@"%ld.%ld.%ld",
  (long)osVer.majorVersion, (long)osVer.minorVersion, (long)osVer.patchVersion];
  }
- // Copy out the char*
- osVersionCStr = strdup([nsVerStr UTF8String]);
  } else {
  // Version 10.16, without explicit env setting of SYSTEM_VERSION_COMPAT
- // AKA 11.x; compute the version number from the letter in the ProductBuildVersion
+ // AKA 11+ Read the *real* ProductVersion from the hidden link to avoid SYSTEM_VERSION_COMPAT
+ // If not found, fallback below to the SystemVersion.plist
  NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile :
- @"/System/Library/CoreServices/SystemVersion.plist"];
+ @"/System/Library/CoreServices/.SystemVersionPlatform.plist"];
  if (version != NULL) {
- NSString *nsBuildVerStr = [version objectForKey : @"ProductBuildVersion"];
- if (nsBuildVerStr != NULL && nsBuildVerStr.length >= 3) {
- int letter = [nsBuildVerStr characterAtIndex:2];
- if (letter >= 'B' && letter <= 'Z') {
- int vers = letter - 'A' - 1;
- asprintf(&osVersionCStr, "11.%d", vers);
- }
- }
+ nsVerStr = [version objectForKey : @"ProductVersion"];
  }
  }
  }
  // Fallback if running on pre-10.9 Mac OS
- if (osVersionCStr == NULL) {
+ if (nsVerStr == NULL) {
  NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile :
  @"/System/Library/CoreServices/SystemVersion.plist"];
  if (version != NULL) {
- NSString *nsVerStr = [version objectForKey : @"ProductVersion"];
- if (nsVerStr != NULL) {
- osVersionCStr = strdup([nsVerStr UTF8String]);
- }
+ nsVerStr = [version objectForKey : @"ProductVersion"];
  }
  }
+
+ if (nsVerStr != NULL) {
+ // Copy out the char*
+ osVersionCStr = strdup([nsVerStr UTF8String]);
+ }
  if (osVersionCStr == NULL) {
  osVersionCStr = strdup("Unknown");
  }