diff options
| author | bors <bors@rust-lang.org> | 2021-09-20 07:21:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-09-20 07:21:05 +0000 |
| commit | db1fb85cff63ad5fffe435e17128f99f9e1d970c (patch) | |
| tree | ca06ae6710ea86d1f428d321a0cafaa5f2dbf083 /src/bootstrap | |
| parent | e71925aab9e28ce35363e3fdef27ca011ac6a1dc (diff) | |
| parent | 5d22b1afe2ff3adb9903cb71ff386828c16fd805 (diff) | |
| download | rust-db1fb85cff63ad5fffe435e17128f99f9e1d970c.tar.gz rust-db1fb85cff63ad5fffe435e17128f99f9e1d970c.zip | |
Auto merge of #88321 - glaubitz:m68k-linux, r=wesleywiser
Add initial support for m68k This patch series adds initial support for m68k making use of the new M68k backend introduced with LLVM-13. Additional changes will be needed to be able to actually use the backend for this target.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 1 | ||||
| -rw-r--r-- | src/bootstrap/native.rs | 2 |
2 files changed, 2 insertions, 1 deletions
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', 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" }; |