about summary refs log tree commit diff
path: root/src/librustc_metadata
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2019-11-09 02:06:22 +0200
committerEduard-Mihai Burtescu <edy.burt@gmail.com>2019-11-09 02:06:22 +0200
commit0da85d62283257516a1dab97f7156a4e0cd96266 (patch)
tree4a96732175e8a8d74e9f94267b4acf62f6e93949 /src/librustc_metadata
parent9e346646e93cc243567e27bb0f4e8716d56ad1f1 (diff)
downloadrust-0da85d62283257516a1dab97f7156a4e0cd96266.tar.gz
rust-0da85d62283257516a1dab97f7156a4e0cd96266.zip
rustc_metadata: don't let LLVM confuse rmeta blobs for COFF object files.
Diffstat (limited to 'src/librustc_metadata')
-rw-r--r--src/librustc_metadata/rmeta/mod.rs9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/librustc_metadata/rmeta/mod.rs b/src/librustc_metadata/rmeta/mod.rs
index 4eabeac6d98..990a3d984b2 100644
--- a/src/librustc_metadata/rmeta/mod.rs
+++ b/src/librustc_metadata/rmeta/mod.rs
@@ -37,18 +37,15 @@ crate fn rustc_version() -> String {
 /// Metadata encoding version.
 /// N.B., increment this if you change the format of metadata such that
 /// the rustc version can't be found to compare with `rustc_version()`.
-const METADATA_VERSION: u8 = 4;
+const METADATA_VERSION: u8 = 5;
 
 /// Metadata header which includes `METADATA_VERSION`.
-/// To get older versions of rustc to ignore this metadata,
-/// there are 4 zero bytes at the start, which are treated
-/// as a length of 0 by old compilers.
 ///
 /// This header is followed by the position of the `CrateRoot`,
 /// which is encoded as a 32-bit big-endian unsigned integer,
 /// and further followed by the rustc version string.
-crate const METADATA_HEADER: &[u8; 12] =
-    &[0, 0, 0, 0, b'r', b'u', b's', b't', 0, 0, 0, METADATA_VERSION];
+crate const METADATA_HEADER: &[u8; 8] =
+    &[b'r', b'u', b's', b't', 0, 0, 0, METADATA_VERSION];
 
 /// Additional metadata for a `Lazy<T>` where `T` may not be `Sized`,
 /// e.g. for `Lazy<[T]>`, this is the length (count of `T` values).