From owner-svn-src-head@freebsd.org  Thu Dec 14 16:51:28 2017
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 3E775E87202;
 Thu, 14 Dec 2017 16:51:28 +0000 (UTC) (envelope-from imp@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 08F906CBB6;
 Thu, 14 Dec 2017 16:51:27 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBEGpQhN071484;
 Thu, 14 Dec 2017 16:51:26 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBEGpQ0B071483;
 Thu, 14 Dec 2017 16:51:26 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201712141651.vBEGpQ0B071483@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 14 Dec 2017 16:51:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326855 - head/stand/ficl
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/stand/ficl
X-SVN-Commit-Revision: 326855
X-SVN-Commit-Repository: base
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.25
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: Thu, 14 Dec 2017 16:51:28 -0000

Author: imp
Date: Thu Dec 14 16:51:26 2017
New Revision: 326855
URL: https://svnweb.freebsd.org/changeset/base/326855

Log:
  Cargo cut a fix for the regressions r326585 caused.
  
  We need to include ficl.h after the standard includes, rather than
  before them. It changes the generated code in ways that haven't been
  completely analyized. This restores the old code generation (as
  verified by md5 changing back for zfsloader).
  
  This should restore GPT + ZFS and GPT + ZFS + GELI booting that was
  broken in r326585 (or would have been if r326584 hadn't broken the
  build).
  
  Sponsored by: Netflix

Modified:
  head/stand/ficl/float.c

Modified: head/stand/ficl/float.c
==============================================================================
--- head/stand/ficl/float.c	Thu Dec 14 16:41:52 2017	(r326854)
+++ head/stand/ficl/float.c	Thu Dec 14 16:51:26 2017	(r326855)
@@ -43,13 +43,13 @@
 
 /* $FreeBSD$ */
 
-#include "ficl.h"
-
-#if FICL_WANT_FLOAT
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+#include "ficl.h"
+
+#if FICL_WANT_FLOAT
 #include <math.h>
 
 /*******************************************************************