svn commit: r273801 - user/dchagin/lemul/sys/amd64/linux

Ed Maste emaste at FreeBSD.org
Tue Oct 28 21:06:05 UTC 2014


Author: emaste
Date: Tue Oct 28 21:06:04 2014
New Revision: 273801
URL: https://svnweb.freebsd.org/changeset/base/273801

Log:
  Apply r267563 to the 64-bit linuxolator
  
  The "new ELF branding type" change originated in the lemul branch and
  was later committed to HEAD and then reverted, leaving the 64-bit
  linuxolator version of the change in the branch.  Revert it now.

Modified:
  user/dchagin/lemul/sys/amd64/linux/linux_sysvec.c

Modified: user/dchagin/lemul/sys/amd64/linux/linux_sysvec.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux/linux_sysvec.c	Tue Oct 28 19:17:44 2014	(r273800)
+++ user/dchagin/lemul/sys/amd64/linux/linux_sysvec.c	Tue Oct 28 21:06:04 2014	(r273801)
@@ -917,7 +917,7 @@ static Elf64_Brandinfo linux_glibc2brand
 	.sysvec		= &elf_linux_sysvec,
 	.interp_newpath	= NULL,
 	.brand_note	= &linux64_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE | BI_CAN_EXEC_INTERP
+	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
 static Elf64_Brandinfo linux_glibc2brandshort = {
@@ -929,7 +929,7 @@ static Elf64_Brandinfo linux_glibc2brand
 	.sysvec		= &elf_linux_sysvec,
 	.interp_newpath	= NULL,
 	.brand_note	= &linux64_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE | BI_CAN_EXEC_INTERP
+	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
 Elf64_Brandinfo *linux_brandlist[] = {


More information about the svn-src-user mailing list