about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-05-29 02:33:26 +0200
committerGitHub <noreply@github.com>2020-05-29 02:33:26 +0200
commitc9f07d3cfeaa98991208e731ed29109b91735a80 (patch)
treef138233811582069ef7ae268ba413375bf683f17
parent71512e425fe8644cdc17c47571909ab32e4e9c47 (diff)
parentbb745d6a1878afecce3689c94e514fdf7831e8a1 (diff)
downloadrust-c9f07d3cfeaa98991208e731ed29109b91735a80.tar.gz
rust-c9f07d3cfeaa98991208e731ed29109b91735a80.zip
Rollup merge of #72695 - jclulow:illumos-llvm-catchup, r=nikic
update data layout for illumos x86

In a recent change, 8b199222cc92667cd0e57595ad435cd0a7526af8,
adjustments were made to the data layout we pass to LLVM.
Unfortunately, the illumos target was missed in this change.
See also: https://github.com/rust-lang/rust/pull/67900
-rw-r--r--src/librustc_target/spec/x86_64_unknown_illumos.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_target/spec/x86_64_unknown_illumos.rs b/src/librustc_target/spec/x86_64_unknown_illumos.rs
index 8d461f67397..2567ca47ef9 100644
--- a/src/librustc_target/spec/x86_64_unknown_illumos.rs
+++ b/src/librustc_target/spec/x86_64_unknown_illumos.rs
@@ -13,7 +13,8 @@ pub fn target() -> TargetResult {
         target_endian: "little".to_string(),
         target_pointer_width: "64".to_string(),
         target_c_int_width: "32".to_string(),
-        data_layout: "e-m:e-i64:64-f80:128-n8:16:32:64-S128".to_string(),
+        data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+            .to_string(),
         arch: "x86_64".to_string(),
         target_os: "illumos".to_string(),
         target_env: String::new(),