From owner-svn-src-user@FreeBSD.ORG Fri May 30 18:14:16 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85460277; Fri, 30 May 2014 18:14:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5955721E9; Fri, 30 May 2014 18:14:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4UIEGvv000704; Fri, 30 May 2014 18:14:16 GMT (envelope-from cognet@svn.freebsd.org) Received: (from cognet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4UIEGo3000702; Fri, 30 May 2014 18:14:16 GMT (envelope-from cognet@svn.freebsd.org) Message-Id: <201405301814.s4UIEGo3000702@svn.freebsd.org> From: Olivier Houchard Date: Fri, 30 May 2014 18:14:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r266900 - in user/dchagin/lemul/sys: amd64/linux compat/linux X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 May 2014 18:14:16 -0000 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);