From 108bcd504edb8c4652088dd78fa1f4faddb289fc Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 14 Dec 2017 16:51:26 +0000 Subject: [PATCH] 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 --- stand/ficl/float.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stand/ficl/float.c b/stand/ficl/float.c index b6cda150df8..7090b86f040 100644 --- a/stand/ficl/float.c +++ b/stand/ficl/float.c @@ -43,13 +43,13 @@ /* $FreeBSD$ */ -#include "ficl.h" - -#if FICL_WANT_FLOAT #include #include #include #include +#include "ficl.h" + +#if FICL_WANT_FLOAT #include /*******************************************************************