diff options
| author | bors <bors@rust-lang.org> | 2020-03-24 12:42:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-24 12:42:54 +0000 |
| commit | 374ab25585f0a817fe7bd6986737f12347b12d0b (patch) | |
| tree | 60908a3b892fff185b7ac34e99636a1517bc9c7e /src/test | |
| parent | 1add455ec6f81045e7651c6225902823f5d4fbfa (diff) | |
| parent | 497f879b1e24c369362bcd821959ffabc50a8a31 (diff) | |
Auto merge of #70163 - nikic:llvm-10-preparation, r=cuviper
Prepare for LLVM 10 upgrade This is #67759 minus the submodule update. * Fix two compatibility issues in the rustllvm wrapper. * Update data layout strings in tests. * Fix LLVM version comparison (this become a problem because the major version has two digits now). r? @cuviper
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-make-fulldeps/target-specs/my-awesome-platform.json | 2 | ||||
| -rw-r--r-- | src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json b/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json index 8d028280a8d..00de3de05f0 100644 --- a/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json +++ b/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json @@ -1,5 +1,5 @@ { - "data-layout": "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128", + "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128", "linker-flavor": "gcc", "llvm-target": "i686-unknown-linux-gnu", "target-endian": "little", diff --git a/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json b/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json index 48040ae3da0..6d5e964ed4f 100644 --- a/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json +++ b/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json @@ -1,6 +1,6 @@ { "pre-link-args": {"gcc": ["-m64"]}, - "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128", + "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", "linker-flavor": "gcc", "llvm-target": "x86_64-unknown-linux-gnu", "target-endian": "little", |