Included fixes from the built-in-llvm branch

Author: Gasper

src/bootstrap/config.rs

@@ -544,7 +544,7 @@ impl Config {
             set(&mut config.llvm_static_stdcpp, llvm.static_libstdcpp);
             set(&mut config.llvm_link_shared, llvm.link_shared);
             config.llvm_targets = llvm.targets.clone();
-            config.llvm_experimental_targets = llvm.experimental_targets.clone();
+            config.llvm_experimental_targets = Some(llvm.experimental_targets.clone().unwrap_or("Xtensa".to_string()));
             config.llvm_link_jobs = llvm.link_jobs;
             config.llvm_version_suffix = llvm.version_suffix.clone();
             config.llvm_clang_cl = llvm.clang_cl.clone();

src/librustc_target/spec/xtensa_esp32_none_elf.rs

@@ -1,13 +1,12 @@
 use crate::spec::{abi::Abi, LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
-// use crate::spec::abi::Abi;
 
 pub fn target() -> TargetResult {
     Ok(Target {
         llvm_target: "xtensa-none-elf".to_string(),
         target_endian: "little".to_string(),
         target_pointer_width: "32".to_string(),
         target_c_int_width: "32".to_string(),
-        data_layout: "e-m:e-p:32:32-i1:8:32-i8:8:32-i16:16:32-i64:64-f64:64-a:0:32-n32".to_string(),
+        data_layout: "e-m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32".to_string(),
         arch: "xtensa".to_string(),
         target_os: "none".to_string(),
         target_env: String::new(),
@@ -17,16 +16,9 @@ pub fn target() -> TargetResult {
         options: TargetOptions {
             executables: true,
             cpu: "esp32".to_string(),
-            // The LLVM backend currently can't generate object files. To
-            // workaround this LLVM generates assembly files which then we feed
-            // to gcc to get object files. For this reason we have a hard
-            // dependency on this specific gcc.
-            // asm_args: vec!["-mcpu=esp32".to_string()],
             linker: Some("xtensa-esp32-elf-gcc".to_string()),
-            no_integrated_as: true,
 
             max_atomic_width: Some(32),
-            atomic_cas: true,
 
             // Because these devices have very little resources having an
             // unwinder is too onerous so we default to "abort" because the
@@ -37,17 +29,6 @@ pub fn target() -> TargetResult {
             // code because of the extra costs it involves.
             relocation_model: "static".to_string(),
 
-            // Right now we invoke an external assembler and this isn't
-            // compatible with multiple codegen units, and plus we probably
-            // don't want to invoke that many gcc instances.
-            default_codegen_units: Some(1),
-
-            // Since MSP430 doesn't meaningfully support faulting on illegal
-            // instructions, LLVM generates a call to abort() function instead
-            // of a trap instruction. Such calls are 4 bytes long, and that is
-            // too much overhead for such small target.
-            trap_unreachable: false,
-
             // See the thumb_base.rs file for an explanation of this value
             emit_debug_gdb_scripts: false,
 

src/librustc_target/spec/xtensa_esp8266_none_elf.rs

@@ -1,32 +1,23 @@
 use crate::spec::{abi::Abi, LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
-// use crate::spec::abi::Abi;
 
 pub fn target() -> TargetResult {
     Ok(Target {
         llvm_target: "xtensa-none-elf".to_string(),
         target_endian: "little".to_string(),
         target_pointer_width: "32".to_string(),
         target_c_int_width: "32".to_string(),
-        data_layout: "e-m:e-p:32:32-i1:8:32-i8:8:32-i16:16:32-i64:64-f64:64-a:0:32-n32".to_string(),
+        data_layout: "e-m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32".to_string(),
         arch: "xtensa".to_string(),
         target_os: "none".to_string(),
         target_env: String::new(),
         target_vendor: String::new(),
         linker_flavor: LinkerFlavor::Gcc,
 
         options: TargetOptions {
-            executables: true,
             cpu: "esp8266".to_string(),
-            // The LLVM backend currently can't generate object files. To
-            // workaround this LLVM generates assembly files which then we feed
-            // to gcc to get object files. For this reason we have a hard
-            // dependency on this specific gcc.
-            // asm_args: vec!["-mcpu=esp8266".to_string()],
-            linker: Some("xtensa-lx106-elf-gcc".to_string()),
-            no_integrated_as: true,
+            linker: Some("xtensa-esp32-elf-ld".to_string()),
 
             max_atomic_width: Some(32),
-            atomic_cas: true,
 
             // Because these devices have very little resources having an
             // unwinder is too onerous so we default to "abort" because the
@@ -37,17 +28,6 @@ pub fn target() -> TargetResult {
             // code because of the extra costs it involves.
             relocation_model: "static".to_string(),
 
-            // Right now we invoke an external assembler and this isn't
-            // compatible with multiple codegen units, and plus we probably
-            // don't want to invoke that many gcc instances.
-            default_codegen_units: Some(1),
-
-            // Since MSP430 doesn't meaningfully support faulting on illegal
-            // instructions, LLVM generates a call to abort() function instead
-            // of a trap instruction. Such calls are 4 bytes long, and that is
-            // too much overhead for such small target.
-            trap_unreachable: false,
-
             // See the thumb_base.rs file for an explanation of this value
             emit_debug_gdb_scripts: false,
 

src/librustc_target/spec/xtensa_none_elf.rs

@@ -1,13 +1,12 @@
 use crate::spec::{abi::Abi, LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult};
-// use crate::spec::abi::Abi;
 
 pub fn target() -> TargetResult {
     Ok(Target {
         llvm_target: "xtensa-none-elf".to_string(),
         target_endian: "little".to_string(),
         target_pointer_width: "32".to_string(),
         target_c_int_width: "32".to_string(),
-        data_layout: "e-m:e-p:32:32-i1:8:32-i8:8:32-i16:16:32-i64:64-f64:64-a:0:32-n32".to_string(),
+        data_layout: "e-m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32".to_string(),
         arch: "xtensa".to_string(),
         target_os: "none".to_string(),
         target_env: String::new(),
@@ -16,17 +15,9 @@ pub fn target() -> TargetResult {
 
         options: TargetOptions {
             executables: true,
-
-            // The LLVM backend currently can't generate object files. To
-            // workaround this LLVM generates assembly files which then we feed
-            // to gcc to get object files. For this reason we have a hard
-            // dependency on this specific gcc.
-            // asm_args: vec!["-mcpu=generic".to_string()],
             linker: Some("xtensa-esp32-elf-gcc".to_string()),
-            no_integrated_as: true,
 
             max_atomic_width: Some(32),
-            atomic_cas: true,
 
             // Because these devices have very little resources having an
             // unwinder is too onerous so we default to "abort" because the
@@ -37,17 +28,6 @@ pub fn target() -> TargetResult {
             // code because of the extra costs it involves.
             relocation_model: "static".to_string(),
 
-            // Right now we invoke an external assembler and this isn't
-            // compatible with multiple codegen units, and plus we probably
-            // don't want to invoke that many gcc instances.
-            default_codegen_units: Some(1),
-
-            // Since MSP430 doesn't meaningfully support faulting on illegal
-            // instructions, LLVM generates a call to abort() function instead
-            // of a trap instruction. Such calls are 4 bytes long, and that is
-            // too much overhead for such small target.
-            trap_unreachable: false,
-
             // See the thumb_base.rs file for an explanation of this value
             emit_debug_gdb_scripts: false,