From 0ad0d305ffdebe15127a5c766ce5d9978ce1fe0f Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Wed, 25 Aug 2021 07:43:20 +0000
Subject: bootstrap: Add cputype matching for m68k

---
 src/bootstrap/bootstrap.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/bootstrap')

diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 1f1eca1c76c..57ade88f733 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -277,6 +277,7 @@ def default_build_triple(verbose):
         'i486': 'i686',
         'i686': 'i686',
         'i786': 'i686',
+        'm68k': 'm68k',
         'powerpc': 'powerpc',
         'powerpc64': 'powerpc64',
         'powerpc64le': 'powerpc64le',
-- 
cgit 1.4.1-3-g733a5


From df7ad3af210efbb42239780c62176eeaa73dcb5b Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Wed, 25 Aug 2021 07:43:42 +0000
Subject: bootstrap: Add LLVM target matching for M68k

---
 config.toml.example     | 2 +-
 src/bootstrap/native.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/bootstrap')

diff --git a/config.toml.example b/config.toml.example
index c2d51c140b4..aff4e8fa82a 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -103,7 +103,7 @@ changelog-seen = 2
 # the same format as above, but since these targets are experimental, they are
 # not built by default and the experimental Rust compilation targets that depend
 # on them will not work unless the user opts in to building them.
-#experimental-targets = "AVR"
+#experimental-targets = "AVR;M68k"
 
 # Cap the number of parallel linker invocations when compiling LLVM.
 # This can be useful when building LLVM with debug info, which significantly
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index 0e306cb7211..27c9bb2504f 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -165,7 +165,7 @@ impl Step for Llvm {
 
         let llvm_exp_targets = match builder.config.llvm_experimental_targets {
             Some(ref s) => s,
-            None => "AVR",
+            None => "AVR;M68k",
         };
 
         let assertions = if builder.config.llvm_assertions { "ON" } else { "OFF" };
-- 
cgit 1.4.1-3-g733a5