MFS: bring the consistent `compat_3_brand' support into -CURRENT

     (the work was first done in the RELENG_4 branch near a release
	 during a MFC to make the code cleaner and more consistent)

1 files changed, 4 insertions, 2 deletions

diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
index 4d87bed..0753122 100644
--- a/sys/sys/imgact_elf.h
+++ b/sys/sys/imgact_elf.h
@@ -57,6 +57,7 @@ typedef struct {
 
 typedef struct {
 	int brand;
+	const char *compat_3_brand;	/* pre Binutils 2.10 method (FBSD 3) */
 	const char *emul_path;
 	const char *interp_path;
         struct sysentvec *sysvec;
@@ -88,8 +89,9 @@ typedef struct {
 
 typedef struct {
 	int brand;
-	char *emul_path;
-	char *interp_path;
+	const char *compat_3_brand;	/* pre Binutils 2.10 method (FBSD 3) */
+	const char *emul_path;
+	const char *interp_path;
         struct sysentvec *sysvec;
 } Elf64_Brandinfo;