From 092aeb28fc5a13fb9ed1d4b7675f3c33e970f1d3 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 31 Jan 2021 09:52:51 +0000
Subject: merge revision(s) 7cb8904a12c850ee30dcd67817fa2f9dc3fee813: [Backport
 #17567]

	Extract correct processor name for ARM64 Macs

	---
	 tool/m4/ruby_universal_arch.m4 | 3 +++
	 1 file changed, 3 insertions(+)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 tool/m4/ruby_universal_arch.m4 | 3 +++
 version.h                      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tool/m4/ruby_universal_arch.m4 b/tool/m4/ruby_universal_arch.m4
index a524bc2592..dd9ad7ee46 100644
--- a/tool/m4/ruby_universal_arch.m4
+++ b/tool/m4/ruby_universal_arch.m4
@@ -66,6 +66,9 @@ AS_IF([test ${target_archs+set}], [
 #ifdef __ppc64__
 "processor-name=powerpc64"
 #endif
+#ifdef __arm64__
+"processor-name=arm64"
+#endif
 EOF
 	    sed -n 's/^"processor-name=\(.*\)"/\1/p'`
 	    target="$target_cpu${target}"
diff --git a/version.h b/version.h
index f92fbfd14a..10897716f8 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.6.7"
 #define RUBY_RELEASE_DATE "2021-01-31"
-#define RUBY_PATCHLEVEL 151
+#define RUBY_PATCHLEVEL 152
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 1
-- 
cgit v1.2.3