@@ -12,7 +12,6 @@ use object::{
12
12
13
13
use snap:: write:: FrameEncoder ;
14
14
15
- use object:: elf:: NT_GNU_PROPERTY_TYPE_0 ;
16
15
use rustc_data_structures:: memmap:: Mmap ;
17
16
use rustc_data_structures:: owned_slice:: { try_slice_owned, OwnedSlice } ;
18
17
use rustc_metadata:: fs:: METADATA_FILENAME ;
@@ -124,7 +123,7 @@ fn add_gnu_property_note(
124
123
let mut data: Vec < u8 > = Vec :: new ( ) ;
125
124
let n_namsz: u32 = 4 ; // Size of the n_name field
126
125
let n_descsz: u32 = 16 ; // Size of the n_desc field
127
- let n_type: u32 = NT_GNU_PROPERTY_TYPE_0 ; // Type of note descriptor
126
+ let n_type: u32 = object :: elf :: NT_GNU_PROPERTY_TYPE_0 ; // Type of note descriptor
128
127
let header_values = [ n_namsz, n_descsz, n_type] ;
129
128
header_values. iter ( ) . for_each ( |v| {
130
129
data. extend_from_slice ( & match endianness {
@@ -134,8 +133,8 @@ fn add_gnu_property_note(
134
133
} ) ;
135
134
data. extend_from_slice ( b"GNU\0 " ) ; // Owner of the program property note
136
135
let pr_type: u32 = match architecture {
137
- Architecture :: X86_64 => 0xc0000002 ,
138
- Architecture :: Aarch64 => 0xc0000000 ,
136
+ Architecture :: X86_64 => object :: elf :: GNU_PROPERTY_X86_FEATURE_1_AND ,
137
+ Architecture :: Aarch64 => object :: elf :: GNU_PROPERTY_AARCH64_FEATURE_1_AND ,
139
138
_ => unreachable ! ( ) ,
140
139
} ;
141
140
let pr_datasz: u32 = 4 ; //size of the pr_data field
0 commit comments