From owner-svn-src-head@FreeBSD.ORG  Sun May 10 13:30:22 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9D3C3109;
 Sun, 10 May 2015 13:30:22 +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 8BA5E1DBF;
 Sun, 10 May 2015 13:30:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4ADUMSU033124;
 Sun, 10 May 2015 13:30:22 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4ADUMrm033123;
 Sun, 10 May 2015 13:30:22 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201505101330.t4ADUMrm033123@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Sun, 10 May 2015 13:30:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282728 - head/sys/boot/efi/loader/arch/i386
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 May 2015 13:30:22 -0000

Author: ian
Date: Sun May 10 13:30:21 2015
New Revision: 282728
URL: https://svnweb.freebsd.org/changeset/base/282728

Log:
  Don't check the return value from self_reloc(), it can't fail and doesn't
  return a value.
  
  Despite what I said in my prior commit, it turns out this one platform
  was checking the return value from the old self-reloc code (which returned
  a hard-coded 0).

Modified:
  head/sys/boot/efi/loader/arch/i386/start.S

Modified: head/sys/boot/efi/loader/arch/i386/start.S
==============================================================================
--- head/sys/boot/efi/loader/arch/i386/start.S	Sun May 10 13:24:26 2015	(r282727)
+++ head/sys/boot/efi/loader/arch/i386/start.S	Sun May 10 13:30:21 2015	(r282728)
@@ -54,8 +54,6 @@ ENTRY(_start)
 	pushl	%ebx		/* dynamic */
 	pushl	%eax		/* ImageBase */
 	call	self_reloc
-	cmpl	$EFI_SUCCESS, %eax
-	jne	1f
 	popl	%ebx		/* remove ImageBase from the stack */
 	popl	%ebx		/* remove dynamic from the stack */
 	call	efi_main