svn commit: r266900 - in user/dchagin/lemul/sys: amd64/linux compat/linux

[Olivier Houchard]

Author: cognet
Date: Fri May 30 18:14:15 2014
New Revision: 266900
URL: http://svnweb.freebsd.org/changeset/base/266900

Log:
  Backout, both 32 and 64bits should be able to live peacefully in /compat/linux

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

Modified: user/dchagin/lemul/sys/amd64/linux/linux_sysvec.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux/linux_sysvec.c	Fri May 30 18:05:43 2014	(r266899)
+++ user/dchagin/lemul/sys/amd64/linux/linux_sysvec.c	Fri May 30 18:14:15 2014	(r266900)
@@ -912,7 +912,7 @@ static Elf64_Brandinfo linux_glibc2brand
 	.brand		= ELFOSABI_LINUX,
 	.machine	= EM_X86_64,
 	.compat_3_brand	= "Linux",
-	.emul_path	= "/compat/linux64",
+	.emul_path	= "/compat/linux",
 	.interp_path	= "/lib64/ld-linux-x86-64.so.2",
 	.sysvec		= &elf_linux_sysvec,
 	.interp_newpath	= NULL,
@@ -924,7 +924,7 @@ static Elf64_Brandinfo linux_glibc2brand
 	.brand		= ELFOSABI_LINUX,
 	.machine	= EM_X86_64,
 	.compat_3_brand	= "Linux",
-	.emul_path	= "/compat/linux64",
+	.emul_path	= "/compat/linux",
 	.interp_path	= "/lib64/ld-linux.so.2",
 	.sysvec		= &elf_linux_sysvec,
 	.interp_newpath	= NULL,

Modified: user/dchagin/lemul/sys/compat/linux/linux_util.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_util.c	Fri May 30 18:05:43 2014	(r266899)
+++ user/dchagin/lemul/sys/compat/linux/linux_util.c	Fri May 30 18:14:15 2014	(r266900)
@@ -59,7 +59,6 @@ MALLOC_DEFINE(M_FUTEX, "futex", "Linux f
 MALLOC_DEFINE(M_FUTEX_WP, "futex wp", "Linux futexes wp");
 
 const char      linux_emul_path[] = "/compat/linux";
-const char	linux64_emul_path[] = "/compat/linux64";
 
 /*
  * Search an alternate path before passing pathname arguments on to
@@ -72,14 +71,9 @@ int
 linux_emul_convpath(struct thread *td, const char *path, enum uio_seg pathseg,
     char **pbuf, int cflag, int dfd)
 {
-	const char *lemul_path;
 	int retval;
 
-	if (td->td_proc->p_sysent->sv_flags & SV_LP64)
-		lemul_path = linux64_emul_path;
-	else
-		lemul_path = linux_emul_path;
-	retval = kern_alternate_path(td, lemul_path, path, pathseg, pbuf,
+	retval = kern_alternate_path(td, linux_emul_path, path, pathseg, pbuf,
 	    cflag, dfd);
 
 	return (retval);