[Midnightbsd-cvs] src [10392] trunk/sys: remove kfreebsd

[laffer1 at midnightbsd.org]

Revision: 10392
          http://svnweb.midnightbsd.org/src/?rev=10392
Author:   laffer1
Date:     2018-06-03 21:18:26 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
remove kfreebsd

Modified Paths:
--------------
    trunk/sys/amd64/amd64/elf_machdep.c
    trunk/sys/compat/ia32/ia32_sysvec.c
    trunk/sys/i386/i386/elf_machdep.c
    trunk/sys/sys/imgact_elf.h

Modified: trunk/sys/amd64/amd64/elf_machdep.c
===================================================================
--- trunk/sys/amd64/amd64/elf_machdep.c	2018-06-04 00:42:35 UTC (rev 10391)
+++ trunk/sys/amd64/amd64/elf_machdep.c	2018-06-04 01:18:26 UTC (rev 10392)
@@ -120,18 +120,6 @@
 	(sysinit_cfunc_t) elf64_insert_brand_entry,
 	&freebsd_brand_oinfo);
 
-static Elf64_Brandinfo kfreebsd_brand_info = {
-	.brand		= ELFOSABI_FREEBSD,
-	.machine	= EM_X86_64,
-	.compat_3_brand	= "FreeBSD",
-	.emul_path	= NULL,
-	.interp_path	= "/lib/ld-kfreebsd-x86-64.so.1",
-	.sysvec		= &elf64_freebsd_sysvec,
-	.interp_newpath	= NULL,
-	.brand_note	= &elf64_kfreebsd_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE_MANDATORY
-};
-
 SYSINIT(kelf64, SI_SUB_EXEC, SI_ORDER_ANY,
 	(sysinit_cfunc_t) elf64_insert_brand_entry,
 	&kfreebsd_brand_info);

Modified: trunk/sys/compat/ia32/ia32_sysvec.c
===================================================================
--- trunk/sys/compat/ia32/ia32_sysvec.c	2018-06-04 00:42:35 UTC (rev 10391)
+++ trunk/sys/compat/ia32/ia32_sysvec.c	2018-06-04 01:18:26 UTC (rev 10392)
@@ -177,17 +177,6 @@
 	(sysinit_cfunc_t) elf32_insert_brand_entry,
 	&ia32_brand_oinfo);
 
-static Elf32_Brandinfo kia32_brand_info = {
-	.brand		= ELFOSABI_FREEBSD,
-	.machine	= EM_386,
-	.compat_3_brand	= "FreeBSD",
-	.emul_path	= NULL,
-	.interp_path	= "/lib/ld.so.1",
-	.sysvec		= &ia32_freebsd_sysvec,
-	.brand_note	= &elf32_kfreebsd_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE_MANDATORY
-};
-
 SYSINIT(kia32, SI_SUB_EXEC, SI_ORDER_ANY,
 	(sysinit_cfunc_t) elf32_insert_brand_entry,
 	&kia32_brand_info);

Modified: trunk/sys/i386/i386/elf_machdep.c
===================================================================
--- trunk/sys/i386/i386/elf_machdep.c	2018-06-04 00:42:35 UTC (rev 10391)
+++ trunk/sys/i386/i386/elf_machdep.c	2018-06-04 01:18:26 UTC (rev 10392)
@@ -126,18 +126,6 @@
 	(sysinit_cfunc_t) elf32_insert_brand_entry,
 	&freebsd_brand_oinfo);
 
-static Elf32_Brandinfo kfreebsd_brand_info = {
-	.brand		= ELFOSABI_FREEBSD,
-	.machine	= EM_386,
-	.compat_3_brand	= "FreeBSD",
-	.emul_path	= NULL,
-	.interp_path	= "/lib/ld.so.1",
-	.sysvec		= &elf32_freebsd_sysvec,
-	.interp_newpath	= NULL,
-	.brand_note	= &elf32_kfreebsd_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE_MANDATORY
-};
-
 SYSINIT(kelf32, SI_SUB_EXEC, SI_ORDER_ANY,
 	(sysinit_cfunc_t) elf32_insert_brand_entry,
 	&kfreebsd_brand_info);

Modified: trunk/sys/sys/imgact_elf.h
===================================================================
--- trunk/sys/sys/imgact_elf.h	2018-06-04 00:42:35 UTC (rev 10391)
+++ trunk/sys/sys/imgact_elf.h	2018-06-04 01:18:26 UTC (rev 10392)
@@ -98,7 +98,6 @@
 
 extern int __elfN(fallback_brand);
 extern Elf_Brandnote __elfN(freebsd_brandnote);
-extern Elf_Brandnote __elfN(kfreebsd_brandnote);
 #endif /* _KERNEL */
 
 #endif /* !_SYS_IMGACT_ELF_H_ */