[coreboot-gerrit] Patch set updated for coreboot: cbfstool: Make sure fileno is available on Cygwin

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Fri Oct 23 01:09:53 CEST 2015


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11667

-gerrit

commit f9b68e484bf6ed048ee3971b4628effe2fcab346
Author: Stefan Reinauer <reinauer at chromium.org>
Date:   Tue Sep 15 17:41:07 2015 -0700

    cbfstool: Make sure fileno is available on Cygwin
    
    This patch fixes compilation of cbfstool on Cygwin.
    
    As reported in http://review.coreboot.org/#/c/10027
    cbfstool on Cygwin likes to be compiled with -D_GNU_SOURCE.
    That patch was abandoned because it would unwantedly turn on
    more GNU extensions. Instead of doing that, only enable the
    define on Cygwin, switch to -std=gnu99 instead of -std=c99 to
    make fileno and strdup actually available.
    A MINGW32 check that was forgotten in Makefile was copied over
    from Makefile.inc to keep the two files in sync.
    
    This patch has no impact on non-Windows builds.
    
    Change-Id: I068b181d67daf9c7280110e64aefb634aa20c69b
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
 util/cbfstool/Makefile.inc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
index bd9bbeb..9633ca4 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.inc
@@ -48,7 +48,7 @@ rmodobj += common.o
 rmodobj += elfheaders.o
 rmodobj += xdr.o
 
-TOOLCFLAGS ?= -std=c99 -Werror -Wall -Wextra
+TOOLCFLAGS ?= -Werror -Wall -Wextra
 TOOLCFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow
 TOOLCFLAGS += -Wstrict-prototypes -Wwrite-strings
 TOOLCPPFLAGS ?= -D_DEFAULT_SOURCE # memccpy() from string.h
@@ -71,6 +71,12 @@ HOSTCFLAGS += -fms-extensions
 ifeq ($(shell uname -s | cut -c-7 2>/dev/null), MINGW32)
 TOOLCFLAGS += -mno-ms-bitfields
 endif
+ifeq ($(shell uname -o 2>/dev/null), Cygwin)
+TOOLCFLAGS+=-std=gnu99
+TOOLCPPFLAGS+=-D_GNU_SOURCE
+else
+TOOLCFLAGS+=-std=c99
+endif
 
 $(objutil)/cbfstool/%.o: $(objutil)/cbfstool/%.c
 	printf "    HOSTCC     $(subst $(objutil)/,,$(@))\n"



More information about the coreboot-gerrit mailing list