Pull/2200

make/autoconf/build-aux/autoconf-config.guess

@@ -1263,16 +1263,6 @@ EOF
 		      UNAME_PROCESSOR="x86_64"
 		  fi
 		fi ;;
-	    arm)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="aarch64"
-		  fi
-		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}

make/autoconf/build-aux/config.guess

@@ -101,6 +101,14 @@ if [ "x$OUT" = x ]; then
   fi
 fi
 
+# Test and fix cpu on macos-aarch64, uname -p reports arm, buildsys expects aarch64
+echo $OUT | grep arm-apple-darwin > /dev/null 2> /dev/null
+if test $? = 0; then
+  if [ `uname -m` = arm64 ]; then
+    OUT=aarch64`echo $OUT | sed -e 's/[^-]*//'`
+  fi
+fi
+
 # Test and fix cpu on Macosx when C preprocessor is not on the path
 echo $OUT | grep i386-apple-darwin > /dev/null 2> /dev/null
 if test $? = 0; then

src/hotspot/os/aix/os_aix.cpp

@@ -66,7 +66,6 @@
 #include "runtime/perfMemory.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/statSampler.hpp"
-#include "runtime/stubRoutines.hpp"
 #include "runtime/stubRoutines.inline.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/threadCritical.hpp"

src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp

@@ -34,7 +34,6 @@
 #include "logging/log.hpp"
 #include "runtime/init.hpp"
 #include "runtime/os.hpp"
-#include "runtime/stubRoutines.hpp"
 #include "runtime/stubRoutines.inline.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"

src/hotspot/share/runtime/stubRoutines.inline.hpp

@@ -25,8 +25,8 @@
 #ifndef SHARE_RUNTIME_STUBROUTINES_INLINE_HPP
 #define SHARE_RUNTIME_STUBROUTINES_INLINE_HPP
 
-#include <runtime/thread.hpp>
-#include <runtime/stubRoutines.hpp>
+#include "runtime/thread.hpp"
+#include "runtime/stubRoutines.hpp"
 
 // Safefetch allows to load a value from a location that's not known
 // to be valid. If the load causes a fault, the error value is returned.

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/bsd/aarch64/BsdAARCH64ThreadContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, 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