svn commit: r326855 - head/stand/ficl

[Warner Losh]

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>
 
 /*******************************************************************