Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 14 insertions, 4 deletions

diff --git a/vendor/object/src/elf.rs b/vendor/object/src/elf.rs
index 202b3a2cc..da68ec2d4 100644
--- a/vendor/object/src/elf.rs
+++ b/vendor/object/src/elf.rs
@@ -1308,11 +1308,11 @@ pub const PF_MASKOS: u32 = 0x0ff0_0000;
 pub const PF_MASKPROC: u32 = 0xf000_0000;
 
 /// Note name for core files.
-pub static ELF_NOTE_CORE: &[u8] = b"CORE";
+pub const ELF_NOTE_CORE: &[u8] = b"CORE";
 /// Note name for linux core files.
 ///
 /// Notes in linux core files may also use `ELF_NOTE_CORE`.
-pub static ELF_NOTE_LINUX: &[u8] = b"LINUX";
+pub const ELF_NOTE_LINUX: &[u8] = b"LINUX";
 
 // Values for `NoteHeader*::n_type` in core files.
 //
@@ -1826,14 +1826,18 @@ pub struct NoteHeader64<E: Endian> {
 }
 
 /// Solaris entries in the note section have this name.
-pub static ELF_NOTE_SOLARIS: &[u8] = b"SUNW Solaris";
+pub const ELF_NOTE_SOLARIS: &[u8] = b"SUNW Solaris";
 
 // Values for `n_type` when the name is `ELF_NOTE_SOLARIS`.
 /// Desired pagesize for the binary.
 pub const NT_SOLARIS_PAGESIZE_HINT: u32 = 1;
 
 /// GNU entries in the note section have this name.
-pub static ELF_NOTE_GNU: &[u8] = b"GNU";
+pub const ELF_NOTE_GNU: &[u8] = b"GNU";
+
+/// Go entries in the note section have this name.
+// See https://go-review.googlesource.com/9520 and https://go-review.googlesource.com/10704.
+pub const ELF_NOTE_GO: &[u8] = b"Go";
 
 // Note types for `ELF_NOTE_GNU`.
 
@@ -1870,6 +1874,12 @@ pub const NT_GNU_HWCAP: u32 = 2;
 /// The descriptor consists of any nonzero number of bytes.
 pub const NT_GNU_BUILD_ID: u32 = 3;
 
+/// Build ID bits as generated by Go's gc compiler.
+///
+/// The descriptor consists of any nonzero number of bytes.
+// See https://go-review.googlesource.com/10707.
+pub const NT_GO_BUILD_ID: u32 = 4;
+
 /// Version note generated by GNU gold containing a version string.
 pub const NT_GNU_GOLD_VERSION: u32 = 4;