Page MenuHomeFreeBSD
Files F105778452

D1129.diff
No OneTemporary
Actions

D1129.diff
View Options

Index: head/sys/boot/common/load_elf.c
===================================================================
--- head/sys/boot/common/load_elf.c
+++ head/sys/boot/common/load_elf.c
@@ -640,6 +640,14 @@
u_int64_t md_cval; /* common string label */
};
#endif
+#if defined(__amd64__) && __ELF_WORD_SIZE == 32
+struct mod_metadata32 {
+ int md_version; /* structure version MDTV_* */
+ int md_type; /* type of entry MDT_* */
+ u_int32_t md_data; /* specific data */
+ u_int32_t md_cval; /* common string label */
+};
+#endif
int
__elfN(parse_modmetadata)(struct preloaded_file *fp, elf_file_t ef)
@@ -647,6 +655,8 @@
struct mod_metadata md;
#if (defined(__i386__) || defined(__powerpc__)) && __ELF_WORD_SIZE == 64
struct mod_metadata64 md64;
+#elif defined(__amd64__) && __ELF_WORD_SIZE == 32
+ struct mod_metadata32 md32;
#endif
struct mod_depend *mdepend;
struct mod_version mver;
@@ -682,6 +692,18 @@
md.md_type = md64.md_type;
md.md_cval = (const char *)(uintptr_t)md64.md_cval;
md.md_data = (void *)(uintptr_t)md64.md_data;
+#elif defined(__amd64__) && __ELF_WORD_SIZE == 32
+ COPYOUT(v, &md32, sizeof(md32));
+ error = __elfN(reloc_ptr)(fp, ef, v, &md32, sizeof(md32));
+ if (error == EOPNOTSUPP) {
+ md32.md_cval += ef->off;
+ md32.md_data += ef->off;
+ } else if (error != 0)
+ return (error);
+ md.md_version = md32.md_version;
+ md.md_type = md32.md_type;
+ md.md_cval = (const char *)(uintptr_t)md32.md_cval;
+ md.md_data = (void *)(uintptr_t)md32.md_data;
#else
COPYOUT(v, &md, sizeof(md));
error = __elfN(reloc_ptr)(fp, ef, v, &md, sizeof(md));

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 1:49 PM (18 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15541940
Default Alt Text
D1129.diff (1 KB)

Event Timeline