From owner-svn-src-head@freebsd.org  Fri Nov 25 18:57:15 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D3BA2C55EA7;
 Fri, 25 Nov 2016 18:57:15 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 A0DE1863;
 Fri, 25 Nov 2016 18:57:15 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAPIvEaR067878;
 Fri, 25 Nov 2016 18:57:14 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAPIvE1k067877;
 Fri, 25 Nov 2016 18:57:14 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201611251857.uAPIvE1k067877@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 25 Nov 2016 18:57:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309151 - head/sys/conf
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Nov 2016 18:57:15 -0000

Author: emaste
Date: Fri Nov 25 18:57:14 2016
New Revision: 309151
URL: https://svnweb.freebsd.org/changeset/base/309151

Log:
  Use explicit 0x200000 instead of MAXPAGESIZE for the amd64 kernel physaddr
  
  MAXPAGESIZE is not well defined by the GNU ld documentation.
  Different linkers, and different versions of the same linker, use
  different MAXPAGESIZE values. Current versions of GNU gold and LLVM's
  lld use 4K. When set to 4K the kernel panics at boot due to an issue
  with x86bios.
  
  Here we want the kernel physaddr to be the amd64 superpage size, so use
  that value (2MB) explicitly. With this change GNU gold and LLVM lld can
  link a working amd64 kernel.
  
  PR:		214718 (x86bios)
  Differential Revision:	https://reviews.freebsd.org/D8610

Modified:
  head/sys/conf/ldscript.amd64

Modified: head/sys/conf/ldscript.amd64
==============================================================================
--- head/sys/conf/ldscript.amd64	Fri Nov 25 18:12:57 2016	(r309150)
+++ head/sys/conf/ldscript.amd64	Fri Nov 25 18:57:14 2016	(r309151)
@@ -6,7 +6,7 @@ SEARCH_DIR("/usr/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  kernphys = CONSTANT (MAXPAGESIZE);
+  kernphys = 0x200000;
   . = kernbase + kernphys + SIZEOF_HEADERS;
   /*
    * Use the AT keyword in order to set the right LMA that contains