From 53ebcf482a867fd90470781063faf44788bd242a Mon Sep 17 00:00:00 2001 From: Yonghong Yan Date: Thu, 27 Sep 2007 21:54:43 -0500 Subject: [PATCH] forgotten patches --- sys/cpu/amd64/include/segments.h | 5 ++++- sys/sys/imgact_elf.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/cpu/amd64/include/segments.h b/sys/cpu/amd64/include/segments.h index c1cdfc8902..b2106368fd 100644 --- a/sys/cpu/amd64/include/segments.h +++ b/sys/cpu/amd64/include/segments.h @@ -260,15 +260,18 @@ struct savetls { #ifdef _KERNEL extern int _default_ldt; extern union descriptor gdt[]; -extern struct soft_segment_descriptor gdt_segs[]; extern struct gate_descriptor *idt; extern union descriptor ldt[NLDT]; void lgdt (struct region_descriptor *rdp); + +#if 0 +extern struct soft_segment_descriptor gdt_segs[]; void sdtossd (struct segment_descriptor *sdp, struct soft_segment_descriptor *ssdp); void ssdtosd (struct soft_segment_descriptor *ssdp, struct segment_descriptor *sdp); +#endif #endif /* _KERNEL */ #endif /* LOCORE */ diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h index f06ae19bbb..0f250fc39b 100644 --- a/sys/sys/imgact_elf.h +++ b/sys/sys/imgact_elf.h @@ -93,6 +93,7 @@ typedef struct { typedef struct { int brand; const char *compat_3_brand; /* pre Binutils 2.10 method (FBSD 3) */ + int (*match_abi_note)(const Elf_Note *); const char *emul_path; const char *interp_path; struct sysentvec *sysvec; -- 2.11.4.GIT