Skip to content

Commit f8fc141

Browse files
alexcrichtonalexcrichton
committed
rollup merge of #20271: vhbit/datalayout-fix
According to http://llvm.org/docs/LangRef.html#data-layout correct syntax for data layout is `a:<abi>:<pref>` so it looks like `a0:<abi>:<pref>` is either a typo or outdated syntax (as it goes back pretty deep in time)
2 parents 7b5b0b1 + b94bb87 commit f8fc141

18 files changed

+40
-40
lines changed

‎src/librustc_back/arm.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,47 +26,47 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs
2626
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
2727
-f32:32:32-f64:64:64\
2828
-v64:64:64-v128:64:128\
29-
-a0:0:64-n32".to_string()
29+
-a:0:64-n32".to_string()
3030
}
3131

3232
abi::OsiOS => {
3333
"e-p:32:32:32\
3434
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
3535
-f32:32:32-f64:64:64\
3636
-v64:64:64-v128:64:128\
37-
-a0:0:64-n32".to_string()
37+
-a:0:64-n32".to_string()
3838
}
3939

4040
abi::OsWindows => {
4141
"e-p:32:32:32\
4242
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
4343
-f32:32:32-f64:64:64\
4444
-v64:64:64-v128:64:128\
45-
-a0:0:64-n32".to_string()
45+
-a:0:64-n32".to_string()
4646
}
4747

4848
abi::OsLinux => {
4949
"e-p:32:32:32\
5050
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
5151
-f32:32:32-f64:64:64\
5252
-v64:64:64-v128:64:128\
53-
-a0:0:64-n32".to_string()
53+
-a:0:64-n32".to_string()
5454
}
5555

5656
abi::OsAndroid => {
5757
"e-p:32:32:32\
5858
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
5959
-f32:32:32-f64:64:64\
6060
-v64:64:64-v128:64:128\
61-
-a0:0:64-n32".to_string()
61+
-a:0:64-n32".to_string()
6262
}
6363

6464
abi::OsFreebsd | abi::OsDragonfly => {
6565
"e-p:32:32:32\
6666
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
6767
-f32:32:32-f64:64:64\
6868
-v64:64:64-v128:64:128\
69-
-a0:0:64-n32".to_string()
69+
-a:0:64-n32".to_string()
7070
}
7171
},
7272

‎src/librustc_back/mips.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,47 +21,47 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs
2121
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
2222
-f32:32:32-f64:64:64\
2323
-v64:64:64-v128:64:128\
24-
-a0:0:64-n32".to_string()
24+
-a:0:64-n32".to_string()
2525
}
2626

2727
abi::OsiOS => {
2828
"E-p:32:32:32\
2929
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
3030
-f32:32:32-f64:64:64\
3131
-v64:64:64-v128:64:128\
32-
-a0:0:64-n32".to_string()
32+
-a:0:64-n32".to_string()
3333
}
3434

3535
abi::OsWindows => {
3636
"E-p:32:32:32\
3737
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
3838
-f32:32:32-f64:64:64\
3939
-v64:64:64-v128:64:128\
40-
-a0:0:64-n32".to_string()
40+
-a:0:64-n32".to_string()
4141
}
4242

4343
abi::OsLinux => {
4444
"E-p:32:32:32\
4545
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
4646
-f32:32:32-f64:64:64\
4747
-v64:64:64-v128:64:128\
48-
-a0:0:64-n32".to_string()
48+
-a:0:64-n32".to_string()
4949
}
5050

5151
abi::OsAndroid => {
5252
"E-p:32:32:32\
5353
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
5454
-f32:32:32-f64:64:64\
5555
-v64:64:64-v128:64:128\
56-
-a0:0:64-n32".to_string()
56+
-a:0:64-n32".to_string()
5757
}
5858

5959
abi::OsFreebsd | abi::OsDragonfly => {
6060
"E-p:32:32:32\
6161
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
6262
-f32:32:32-f64:64:64\
6363
-v64:64:64-v128:64:128\
64-
-a0:0:64-n32".to_string()
64+
-a:0:64-n32".to_string()
6565
}
6666
},
6767

‎src/librustc_back/mipsel.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,47 +21,47 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs
2121
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
2222
-f32:32:32-f64:64:64\
2323
-v64:64:64-v128:64:128\
24-
-a0:0:64-n32".to_string()
24+
-a:0:64-n32".to_string()
2525
}
2626

2727
abi::OsiOS => {
2828
"e-p:32:32:32\
2929
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
3030
-f32:32:32-f64:64:64\
3131
-v64:64:64-v128:64:128\
32-
-a0:0:64-n32".to_string()
32+
-a:0:64-n32".to_string()
3333
}
3434

3535
abi::OsWindows => {
3636
"e-p:32:32:32\
3737
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
3838
-f32:32:32-f64:64:64\
3939
-v64:64:64-v128:64:128\
40-
-a0:0:64-n32".to_string()
40+
-a:0:64-n32".to_string()
4141
}
4242

4343
abi::OsLinux => {
4444
"e-p:32:32:32\
4545
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
4646
-f32:32:32-f64:64:64\
4747
-v64:64:64-v128:64:128\
48-
-a0:0:64-n32".to_string()
48+
-a:0:64-n32".to_string()
4949
}
5050

5151
abi::OsAndroid => {
5252
"e-p:32:32:32\
5353
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
5454
-f32:32:32-f64:64:64\
5555
-v64:64:64-v128:64:128\
56-
-a0:0:64-n32".to_string()
56+
-a:0:64-n32".to_string()
5757
}
5858

5959
abi::OsFreebsd | abi::OsDragonfly => {
6060
"e-p:32:32:32\
6161
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
6262
-f32:32:32-f64:64:64\
6363
-v64:64:64-v128:64:128\
64-
-a0:0:64-n32".to_string()
64+
-a:0:64-n32".to_string()
6565
}
6666
},
6767

‎src/librustc_back/target/arm_apple_ios.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn target() -> Target {
1616
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
1717
-f32:32:32-f64:64:64\
1818
-v64:64:64-v128:64:128\
19-
-a0:0:64-n32".to_string(),
19+
-a:0:64-n32".to_string(),
2020
llvm_target: "arm-apple-ios".to_string(),
2121
target_endian: "little".to_string(),
2222
target_word_size: "32".to_string(),

‎src/librustc_back/target/arm_linux_androideabi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn target() -> Target {
2424
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
2525
-f32:32:32-f64:64:64\
2626
-v64:64:64-v128:64:128\
27-
-a0:0:64-n32".to_string(),
27+
-a:0:64-n32".to_string(),
2828
llvm_target: "arm-linux-androideabi".to_string(),
2929
target_endian: "little".to_string(),
3030
target_word_size: "32".to_string(),

‎src/librustc_back/target/arm_unknown_linux_gnueabi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn target() -> Target {
1717
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
1818
-f32:32:32-f64:64:64\
1919
-v64:64:64-v128:64:128\
20-
-a0:0:64-n32".to_string(),
20+
-a:0:64-n32".to_string(),
2121
llvm_target: "arm-unknown-linux-gnueabi".to_string(),
2222
target_endian: "little".to_string(),
2323
target_word_size: "32".to_string(),

‎src/librustc_back/target/arm_unknown_linux_gnueabihf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn target() -> Target {
1717
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
1818
-f32:32:32-f64:64:64\
1919
-v64:64:64-v128:64:128\
20-
-a0:0:64-n32".to_string(),
20+
-a:0:64-n32".to_string(),
2121
llvm_target: "arm-unknown-linux-gnueabihf".to_string(),
2222
target_endian: "little".to_string(),
2323
target_word_size: "32".to_string(),

‎src/librustc_back/target/i386_apple_ios.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub fn target() -> Target {
1515
data_layout: "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16\
1616
-i32:32:32-i64:32:64\
1717
-f32:32:32-f64:32:64-v64:64:64\
18-
-v128:128:128-a0:0:64-f80:128:128\
18+
-v128:128:128-a:0:64-f80:128:128\
1919
-n8:16:32".to_string(),
2020
llvm_target: "i386-apple-ios".to_string(),
2121
target_endian: "little".to_string(),

‎src/librustc_back/target/i686_apple_darwin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub fn target() -> Target {
1818
data_layout: "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16\
1919
-i32:32:32-i64:32:64\
2020
-f32:32:32-f64:32:64-v64:64:64\
21-
-v128:128:128-a0:0:64-f80:128:128\
21+
-v128:128:128-a:0:64-f80:128:128\
2222
-n8:16:32".to_string(),
2323
llvm_target: "i686-apple-darwin".to_string(),
2424
target_endian: "little".to_string(),

‎src/librustc_back/target/mips_unknown_linux_gnu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn target() -> Target {
1616
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
1717
-f32:32:32-f64:64:64\
1818
-v64:64:64-v128:64:128\
19-
-a0:0:64-n32".to_string(),
19+
-a:0:64-n32".to_string(),
2020
llvm_target: "mips-unknown-linux-gnu".to_string(),
2121
target_endian: "big".to_string(),
2222
target_word_size: "32".to_string(),

‎src/librustc_back/target/mipsel_unknown_linux_gnu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn target() -> Target {
1616
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
1717
-f32:32:32-f64:64:64\
1818
-v64:64:64-v128:64:128\
19-
-a0:0:64-n32".to_string(),
19+
-a:0:64-n32".to_string(),
2020
llvm_target: "mipsel-unknown-linux-gnu".to_string(),
2121
target_endian: "little".to_string(),
2222
target_word_size: "32".to_string(),

‎src/librustc_back/target/x86_64_apple_darwin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn target() -> Target {
1717

1818
Target {
1919
data_layout: "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\
20-
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\
20+
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a:0:64-\
2121
s0:64:64-f80:128:128-n8:16:32:64".to_string(),
2222
llvm_target: "x86_64-apple-darwin".to_string(),
2323
target_endian: "little".to_string(),

‎src/librustc_back/target/x86_64_pc_windows_gnu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub fn target() -> Target {
1919
Target {
2020
// FIXME: Test this. Copied from linux (#2398)
2121
data_layout: "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\
22-
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\
22+
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a:0:64-\
2323
s0:64:64-f80:128:128-n8:16:32:64-S128".to_string(),
2424
llvm_target: "x86_64-pc-windows-gnu".to_string(),
2525
target_endian: "little".to_string(),

‎src/librustc_back/target/x86_64_unknown_dragonfly.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn target() -> Target {
1616

1717
Target {
1818
data_layout: "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\
19-
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\
19+
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a:0:64-\
2020
s0:64:64-f80:128:128-n8:16:32:64-S128".to_string(),
2121
llvm_target: "x86_64-unknown-dragonfly".to_string(),
2222
target_endian: "little".to_string(),

‎src/librustc_back/target/x86_64_unknown_freebsd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn target() -> Target {
1616

1717
Target {
1818
data_layout: "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\
19-
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\
19+
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a:0:64-\
2020
s0:64:64-f80:128:128-n8:16:32:64-S128".to_string(),
2121
llvm_target: "x86_64-unknown-freebsd".to_string(),
2222
target_endian: "little".to_string(),

‎src/librustc_back/target/x86_64_unknown_linux_gnu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn target() -> Target {
1616

1717
Target {
1818
data_layout: "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\
19-
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\
19+
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a:0:64-\
2020
s0:64:64-f80:128:128-n8:16:32:64-S128".to_string(),
2121
llvm_target: "x86_64-unknown-linux-gnu".to_string(),
2222
target_endian: "little".to_string(),

‎src/librustc_back/x86.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os)
2222
"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16\
2323
-i32:32:32-i64:32:64\
2424
-f32:32:32-f64:32:64-v64:64:64\
25-
-v128:128:128-a0:0:64-f80:128:128\
25+
-v128:128:128-a:0:64-f80:128:128\
2626
-n8:16:32".to_string()
2727
}
2828

2929
abi::OsiOS => {
3030
"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16\
3131
-i32:32:32-i64:32:64\
3232
-f32:32:32-f64:32:64-v64:64:64\
33-
-v128:128:128-a0:0:64-f80:128:128\
33+
-v128:128:128-a:0:64-f80:128:128\
3434
-n8:16:32".to_string()
3535
}
3636

‎src/librustc_back/x86_64.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,42 +19,42 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs
1919
data_layout: match target_os {
2020
abi::OsMacos => {
2121
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\
22-
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\
22+
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a:0:64-\
2323
s0:64:64-f80:128:128-n8:16:32:64".to_string()
2424
}
2525

2626
abi::OsiOS => {
2727
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\
28-
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\
28+
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a:0:64-\
2929
s0:64:64-f80:128:128-n8:16:32:64".to_string()
3030
}
3131

3232
abi::OsWindows => {
3333
// FIXME: Test this. Copied from Linux (#2398)
3434
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\
35-
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\
35+
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a:0:64-\
3636
s0:64:64-f80:128:128-n8:16:32:64-S128".to_string()
3737
}
3838

3939
abi::OsLinux => {
4040
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\
41-
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\
41+
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a:0:64-\
4242
s0:64:64-f80:128:128-n8:16:32:64-S128".to_string()
4343
}
4444
abi::OsAndroid => {
4545
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\
46-
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\
46+
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a:0:64-\
4747
s0:64:64-f80:128:128-n8:16:32:64-S128".to_string()
4848
}
4949

5050
abi::OsFreebsd => {
5151
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\
52-
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\
52+
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a:0:64-\
5353
s0:64:64-f80:128:128-n8:16:32:64-S128".to_string()
5454
}
5555
abi::OsDragonfly => {
5656
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\
57-
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\
57+
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a:0:64-\
5858
s0:64:64-f80:128:128-n8:16:32:64-S128".to_string()
5959
}
6060

0 commit comments

Comments
 (0)