@@ -40,26 +40,25 @@ void ARMTargetInfo::setABIAAPCS() {
40
40
// so set preferred for small types to 32.
41
41
if (T.isOSBinFormatMachO ()) {
42
42
resetDataLayout (BigEndian
43
- ? " E-m:o-p:32:32-Fi8- i64:64-v128:64:128-a:0:32-n32-S64"
44
- : " e-m:o-p:32:32-Fi8- i64:64-v128:64:128-a:0:32-n32-S64" );
43
+ ? " E-m:o-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
44
+ : " e-m:o-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" );
45
45
} else if (T.isOSWindows ()) {
46
46
assert (!BigEndian && " Windows on ARM does not support big endian" );
47
47
resetDataLayout (" e"
48
48
" -m:w"
49
49
" -p:32:32"
50
- " -Fi8"
51
50
" -i64:64"
52
51
" -v128:64:128"
53
52
" -a:0:32"
54
53
" -n32"
55
54
" -S64" );
56
55
} else if (T.isOSNaCl ()) {
57
56
assert (!BigEndian && " NaCl on ARM does not support big endian" );
58
- resetDataLayout (" e-m:e-p:32:32-Fi8- i64:64-v128:64:128-a:0:32-n32-S128" );
57
+ resetDataLayout (" e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S128" );
59
58
} else {
60
59
resetDataLayout (BigEndian
61
- ? " E-m:e-p:32:32-Fi8- i64:64-v128:64:128-a:0:32-n32-S64"
62
- : " e-m:e-p:32:32-Fi8- i64:64-v128:64:128-a:0:32-n32-S64" );
60
+ ? " E-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64"
61
+ : " e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" );
63
62
}
64
63
65
64
// FIXME: Enumerated types are variable width in straight AAPCS.
@@ -88,17 +87,17 @@ void ARMTargetInfo::setABIAPCS(bool IsAAPCS16) {
88
87
89
88
if (T.isOSBinFormatMachO () && IsAAPCS16) {
90
89
assert (!BigEndian && " AAPCS16 does not support big-endian" );
91
- resetDataLayout (" e-m:o-p:32:32-Fi8- i64:64-a:0:32-n32-S128" );
90
+ resetDataLayout (" e-m:o-p:32:32-i64:64-a:0:32-n32-S128" );
92
91
} else if (T.isOSBinFormatMachO ())
93
92
resetDataLayout (
94
93
BigEndian
95
- ? " E-m:o-p:32:32-Fi8- f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32"
96
- : " e-m:o-p:32:32-Fi8- f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32" );
94
+ ? " E-m:o-p:32:32-f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32"
95
+ : " e-m:o-p:32:32-f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32" );
97
96
else
98
97
resetDataLayout (
99
98
BigEndian
100
- ? " E-m:e-p:32:32-Fi8- f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32"
101
- : " e-m:e-p:32:32-Fi8- f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32" );
99
+ ? " E-m:e-p:32:32-f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32"
100
+ : " e-m:e-p:32:32-f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32" );
102
101
103
102
// FIXME: Override "preferred align" for double and long long.
104
103
}
@@ -1056,7 +1055,7 @@ CygwinARMTargetInfo::CygwinARMTargetInfo(const llvm::Triple &Triple,
1056
1055
this ->WCharType = TargetInfo::UnsignedShort;
1057
1056
TLSSupported = false ;
1058
1057
DoubleAlign = LongLongAlign = 64 ;
1059
- resetDataLayout (" e-m:e-p:32:32-Fi8- i64:64-v128:64:128-a:0:32-n32-S64" );
1058
+ resetDataLayout (" e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64" );
1060
1059
}
1061
1060
1062
1061
void CygwinARMTargetInfo::getTargetDefines (const LangOptions &Opts,
0 commit comments