Add va_list_kind to target specification

Each architecture may represent a va_list differently. Add the
va_list_kind enumeration to the target specification that includes the
common ways a va_list is represented.

Author: dlrobertson

src/librustc_back/lib.rs

@@ -168,3 +168,45 @@ impl ToJson for RelroLevel {
         }
     }
 }
+
+#[derive(Clone, Copy, Debug, PartialEq, Hash, RustcEncodable, RustcDecodable)]
+pub enum VaListKind {
+    CharPtr,
+    VoidPtr,
+    AArch64Abi,
+    PowerPcAbi,
+    X86_64Abi,
+}
+
+impl VaListKind {
+    pub fn desc(&self) -> &str {
+        match self {
+            &VaListKind::CharPtr => "char-ptr",
+            &VaListKind::VoidPtr => "void-ptr",
+            &VaListKind::AArch64Abi => "aarch64-abi",
+            &VaListKind::PowerPcAbi => "powerpc-abi",
+            &VaListKind::X86_64Abi => "x86_64-abi",
+        }
+    }
+}
+
+impl FromStr for VaListKind {
+    type Err = ();
+
+    fn from_str(s: &str) -> Result<VaListKind, ()> {
+        match s {
+            "char-ptr" => Ok(VaListKind::CharPtr),
+            "void-ptr" => Ok(VaListKind::VoidPtr),
+            "aarch64-abi" => Ok(VaListKind::AArch64Abi),
+            "powerpc-abi" => Ok(VaListKind::PowerPcAbi),
+            "x86_64-abi" => Ok(VaListKind::X86_64Abi),
+            _ => Err(()),
+        }
+    }
+}
+
+impl ToJson for VaListKind {
+    fn to_json(&self) -> Json {
+        self.desc().to_json()
+    }
+}

src/librustc_back/target/aarch64_linux_android.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 // See https://developer.android.com/ndk/guides/abis.html#arm64-v8a
 // for target ABI requirements.
@@ -20,6 +20,7 @@ pub fn target() -> TargetResult {
     // As documented in http://developer.android.com/ndk/guides/cpu-features.html
     // the neon (ASIMD) and FP must exist on all android aarch64 targets.
     base.features = "+neon,+fp-armv8".to_string();
+    base.va_list_kind = VaListKind::AArch64Abi;
     Ok(Target {
         llvm_target: "aarch64-linux-android".to_string(),
         target_endian: "little".to_string(),

src/librustc_back/target/aarch64_unknown_cloudabi.rs

@@ -9,13 +9,14 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetResult};
+use target::{Target, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let mut base = super::cloudabi_base::opts();
     base.max_atomic_width = Some(128);
     base.abi_blacklist = super::arm_base::abi_blacklist();
     base.linker = Some("aarch64-unknown-cloudabi-cc".to_string());
+    base.va_list_kind = VaListKind::AArch64Abi;
 
     Ok(Target {
         llvm_target: "aarch64-unknown-cloudabi".to_string(),

src/librustc_back/target/aarch64_unknown_freebsd.rs

@@ -9,11 +9,12 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let mut base = super::freebsd_base::opts();
     base.max_atomic_width = Some(128);
+    base.va_list_kind = VaListKind::AArch64Abi;
 
     // see #36994
     base.exe_allocation_crate = None;

src/librustc_back/target/aarch64_unknown_fuchsia.rs

@@ -9,11 +9,12 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let mut base = super::fuchsia_base::opts();
     base.max_atomic_width = Some(128);
+    base.va_list_kind = VaListKind::AArch64Abi;
 
     Ok(Target {
         llvm_target: "aarch64-unknown-fuchsia".to_string(),

src/librustc_back/target/aarch64_unknown_linux_gnu.rs

@@ -9,11 +9,12 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let mut base = super::linux_base::opts();
     base.max_atomic_width = Some(128);
+    base.va_list_kind = VaListKind::AArch64Abi;
 
     // see #36994
     base.exe_allocation_crate = None;

src/librustc_back/target/aarch64_unknown_linux_musl.rs

@@ -9,11 +9,12 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let mut base = super::linux_musl_base::opts();
     base.max_atomic_width = Some(128);
+    base.va_list_kind = VaListKind::AArch64Abi;
 
     // see #36994
     base.exe_allocation_crate = None;

src/librustc_back/target/apple_ios_base.rs

@@ -11,7 +11,7 @@
 use LinkerFlavor;
 use std::io;
 use std::process::Command;
-use target::{LinkArgs, TargetOptions};
+use target::{LinkArgs, TargetOptions, VaListKind};
 
 use self::Arch::*;
 
@@ -93,6 +93,13 @@ fn target_cpu(arch: Arch) -> String {
 
 pub fn opts(arch: Arch) -> Result<TargetOptions, String> {
     let pre_link_args = build_pre_link_args(arch)?;
+    let va_list_kind = match arch {
+        Arch::Armv7 | Arch::Armv7s => VaListKind::VoidPtr,
+        Arch::Arm64 => VaListKind::AArch64Abi,
+        Arch::I386 => VaListKind::CharPtr,
+        Arch::X86_64 => VaListKind::X86_64Abi,
+    };
+
     Ok(TargetOptions {
         cpu: target_cpu(arch),
         dynamic_linking: false,
@@ -103,6 +110,7 @@ pub fn opts(arch: Arch) -> Result<TargetOptions, String> {
         // ios. jemalloc 5.0 is supposed to fix this.
         // see https://github.com/rust-lang/rust/issues/45262
         exe_allocation_crate: None,
+        va_list_kind,
         .. super::apple_base::opts()
     })
 }

src/librustc_back/target/arm_linux_androideabi.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let mut base = super::android_base::opts();
@@ -30,6 +30,7 @@ pub fn target() -> TargetResult {
         linker_flavor: LinkerFlavor::Gcc,
         options: TargetOptions {
             abi_blacklist: super::arm_base::abi_blacklist(),
+            va_list_kind: VaListKind::VoidPtr,
             .. base
         },
     })

src/librustc_back/target/arm_unknown_linux_gnueabi.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let mut base = super::linux_base::opts();
@@ -29,6 +29,7 @@ pub fn target() -> TargetResult {
         options: TargetOptions {
             features: "+strict-align,+v6".to_string(),
             abi_blacklist: super::arm_base::abi_blacklist(),
+            va_list_kind: VaListKind::VoidPtr,
             .. base
         },
     })

src/librustc_back/target/arm_unknown_linux_gnueabihf.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let mut base = super::linux_base::opts();
@@ -29,6 +29,7 @@ pub fn target() -> TargetResult {
         options: TargetOptions {
             features: "+strict-align,+v6,+vfp2".to_string(),
             abi_blacklist: super::arm_base::abi_blacklist(),
+            va_list_kind: VaListKind::VoidPtr,
             .. base
         }
     })

src/librustc_back/target/arm_unknown_linux_musleabi.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let mut base = super::linux_musl_base::opts();
@@ -34,6 +34,7 @@ pub fn target() -> TargetResult {
         linker_flavor: LinkerFlavor::Gcc,
         options: TargetOptions {
             abi_blacklist: super::arm_base::abi_blacklist(),
+            va_list_kind: VaListKind::VoidPtr,
             .. base
         },
     })

src/librustc_back/target/arm_unknown_linux_musleabihf.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let mut base = super::linux_musl_base::opts();
@@ -34,6 +34,7 @@ pub fn target() -> TargetResult {
         linker_flavor: LinkerFlavor::Gcc,
         options: TargetOptions {
             abi_blacklist: super::arm_base::abi_blacklist(),
+            va_list_kind: VaListKind::VoidPtr,
             .. base
         },
     })

src/librustc_back/target/armv4t_unknown_linux_gnueabi.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let base = super::linux_base::opts();
@@ -30,6 +30,7 @@ pub fn target() -> TargetResult {
             // Atomic operations provided by compiler-builtins
             max_atomic_width: Some(32),
             abi_blacklist: super::arm_base::abi_blacklist(),
+            va_list_kind: VaListKind::VoidPtr,
             .. base
         }
     })

src/librustc_back/target/armv5te_unknown_linux_gnueabi.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let base = super::linux_base::opts();
@@ -30,6 +30,7 @@ pub fn target() -> TargetResult {
             // Atomic operations provided by compiler-builtins
             max_atomic_width: Some(32),
             abi_blacklist: super::arm_base::abi_blacklist(),
+            va_list_kind: VaListKind::VoidPtr,
             .. base
         }
     })

src/librustc_back/target/armv7_linux_androideabi.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 // See https://developer.android.com/ndk/guides/abis.html#v7a
 // for target ABI requirements.
@@ -34,6 +34,7 @@ pub fn target() -> TargetResult {
         linker_flavor: LinkerFlavor::Gcc,
         options: TargetOptions {
             abi_blacklist: super::arm_base::abi_blacklist(),
+            va_list_kind: VaListKind::VoidPtr,
             .. base
         },
     })

src/librustc_back/target/armv7_unknown_cloudabi_eabihf.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetResult};
+use target::{Target, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let mut base = super::cloudabi_base::opts();
@@ -18,6 +18,7 @@ pub fn target() -> TargetResult {
     base.features = "+v7,+vfp3,+neon".to_string();
     base.abi_blacklist = super::arm_base::abi_blacklist();
     base.linker = Some("armv7-unknown-cloudabi-eabihf-cc".to_string());
+    base.va_list_kind = VaListKind::VoidPtr;
 
     Ok(Target {
         llvm_target: "armv7-unknown-cloudabi-eabihf".to_string(),

src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let base = super::linux_base::opts();
@@ -31,6 +31,7 @@ pub fn target() -> TargetResult {
             cpu: "generic".to_string(),
             max_atomic_width: Some(64),
             abi_blacklist: super::arm_base::abi_blacklist(),
+            va_list_kind: VaListKind::VoidPtr,
             .. base
         }
     })

src/librustc_back/target/armv7_unknown_linux_musleabihf.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetOptions, TargetResult};
+use target::{Target, TargetOptions, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let base = super::linux_musl_base::opts();
@@ -35,6 +35,7 @@ pub fn target() -> TargetResult {
             cpu: "generic".to_string(),
             max_atomic_width: Some(64),
             abi_blacklist: super::arm_base::abi_blacklist(),
+            va_list_kind: VaListKind::VoidPtr,
             .. base
         }
     })

src/librustc_back/target/i686_apple_darwin.rs

@@ -9,14 +9,15 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetResult};
+use target::{Target, TargetResult, VaListKind};
 
 pub fn target() -> TargetResult {
     let mut base = super::apple_base::opts();
     base.cpu = "yonah".to_string();
     base.max_atomic_width = Some(64);
     base.pre_link_args.insert(LinkerFlavor::Gcc, vec!["-m32".to_string()]);
     base.stack_probes = true;
+    base.va_list_kind = VaListKind::CharPtr;
 
     Ok(Target {
         llvm_target: "i686-apple-darwin".to_string(),
@@ -29,6 +30,6 @@ pub fn target() -> TargetResult {
         target_env: "".to_string(),
         target_vendor: "apple".to_string(),
         linker_flavor: LinkerFlavor::Gcc,
-        options: base,
+        options: base
     })
 }

src/librustc_back/target/i686_linux_android.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use LinkerFlavor;
-use target::{Target, TargetResult};
+use target::{Target, TargetResult, VaListKind};
 
 // See https://developer.android.com/ndk/guides/abis.html#x86
 // for target ABI requirements.
@@ -23,6 +23,7 @@ pub fn target() -> TargetResult {
     base.cpu = "pentiumpro".to_string();
     base.features = "+mmx,+sse,+sse2,+sse3,+ssse3".to_string();
     base.stack_probes = true;
+    base.va_list_kind = VaListKind::CharPtr;
 
     Ok(Target {
         llvm_target: "i686-linux-android".to_string(),