Skip to content

Commit 7d77a25

Browse files
committed
Use aarch64/AArch64 consistently over arm64/ARM64
* The correct name is AArch64 and arm64 is too visually similar to amd64.
1 parent 4acb059 commit 7d77a25

File tree

14 files changed

+19
-23
lines changed

14 files changed

+19
-23
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ New features:
554554
* `foreign_object.to_s` now uses `InteropLibrary#toDisplayString()` (and still `asString()` if `isString()`).
555555
* `foreign_object.inspect` has been improved to be more useful (include the language and meta object).
556556
* `foreign_object.class` now calls `getMetaObject()` (except for Java classes, same as before).
557-
* Add basic support for Linux ARM64.
557+
* Add basic support for Linux AArch64.
558558
* `foreign_object.name = value` will now call `Interoplibrary#writeMember("name", value)` instead of `invokeMember("name=", value)`.
559559
* Always show the Ruby core library files in backtraces (#1414).
560560
* The Java stacktrace is now shown when sending SIGQUIT to the process, also on TruffleRuby Native, see [Debugging](doc/user/debugging.md) for details (#2041).

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ TruffleRuby is actively tested on the following systems:
9696
Architectures:
9797

9898
* AMD64 (aka `x86_64`): Supported
99-
* AArch64 (aka `arm64`): Supported on Linux (from 21.2)
99+
* AArch64 (aka `arm64`): Supported on Linux (from 21.2) and on macOS (from 22.2)
100100

101101
You may find that TruffleRuby will not work if you severely restrict the
102102
environment, for example, by unmounting system filesystems such as `/dev/shm`.

ci.jsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ local part_definitions = {
271271
},
272272
},
273273
linux_aarch64: linux_deps + {
274-
platform_name:: "LinuxARM64",
274+
platform_name:: "LinuxAArch64",
275275
platform: "linux",
276276
arch:: "aarch64",
277277
"$.cap":: {
@@ -290,7 +290,7 @@ local part_definitions = {
290290
},
291291
},
292292
darwin_aarch64: darwin_aarch64_deps + {
293-
platform_name:: "DarwinARM64",
293+
platform_name:: "DarwinAArch64",
294294
platform: "darwin",
295295
arch:: "aarch64",
296296
"$.cap":: {

spec/ruby/core/process/spawn_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@
349349
pgid = Process.getpgid(Process.pid)
350350
# The process group is not available on all platforms.
351351
# See "man proc" - /proc/[pid]/stat - (5) pgrp
352-
# In Travis arm64 environment, the value is 0.
352+
# In Travis aarch64 environment, the value is 0.
353353
#
354354
# $ cat /proc/[pid]/stat
355355
# 19179 (ruby) S 19160 0 0 ...
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
arm64:Socket#listen using IPv4 using a DGRAM socket raises Errno::EOPNOTSUPP
1+
aarch64:Socket#listen using IPv4 using a DGRAM socket raises Errno::EOPNOTSUPP

spec/tags/truffle/irb/arrows_tags.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
slow:IRB supports using arrow keys first
2-
arm64:IRB supports using arrow keys first
2+
aarch64:IRB supports using arrow keys first
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
slow:IRB can be interrupted with Ctrl+C
2-
arm64:IRB can be interrupted with Ctrl+C
2+
aarch64:IRB can be interrupted with Ctrl+C

spec/tags/truffle/launcher_tags.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ slow:The launcher supports running rdoc symlinked
5656
slow:The launcher supports running ri symlinked
5757
slow:The launcher supports running ruby symlinked
5858
slow:The launcher supports running truffleruby symlinked
59-
arm64:The launcher for gem can install and uninstall the hello-world gem
59+
aarch64:The launcher for gem can install and uninstall the hello-world gem
6060
slow:The launcher should recognize ruby --vm options in RUBYOPT
6161
slow:The launcher should recognize ruby --vm options in TRUFFLERUBYOPT
6262
slow:The launcher runtime configuration flags should recognize ruby --vm options in RUBYOPT when switching to JVM

spec/truffleruby.mspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class MSpecScript
2525
RbConfig::CONFIG['host_os'].include?('solaris')
2626
end
2727

28-
def self.arm64?
28+
def self.aarch64?
2929
%w[arm64 aarch64].include? RbConfig::CONFIG['host_cpu']
3030
end
3131

@@ -134,8 +134,8 @@ class MSpecScript
134134
excludes << 'solaris'
135135
end
136136

137-
if arm64?
138-
excludes << 'arm64'
137+
if aarch64?
138+
excludes << 'aarch64'
139139
end
140140

141141
# All specs, excluding specs needing C-extensions support, and TracePoint specs.

src/main/java/org/truffleruby/platform/DarwinARM64NativeConfiguration.java renamed to src/main/java/org/truffleruby/platform/DarwinAArch64NativeConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
import org.truffleruby.RubyContext;
4141

42-
public class DarwinARM64NativeConfiguration extends DefaultNativeConfiguration {
42+
public class DarwinAArch64NativeConfiguration extends DefaultNativeConfiguration {
4343

4444
public static void load(NativeConfiguration configuration, RubyContext context) {
4545
// Generated from tool/generate-native-config.rb on arm64-darwin20

0 commit comments

Comments
 (0)