diff options
Diffstat (limited to 'config/coreboot/fam15h')
8 files changed, 917 insertions, 0 deletions
diff --git a/config/coreboot/fam15h/nuke.list b/config/coreboot/fam15h/nuke.list new file mode 100644 index 00000000..8ca7a4cf --- /dev/null +++ b/config/coreboot/fam15h/nuke.list @@ -0,0 +1 @@ +3rdparty/vboot/tests diff --git a/config/coreboot/fam15h/patches/0013-Fix-build-with-GCC-15-as-host-compiler.patch b/config/coreboot/fam15h/patches/0013-Fix-build-with-GCC-15-as-host-compiler.patch new file mode 100644 index 00000000..b08c9edf --- /dev/null +++ b/config/coreboot/fam15h/patches/0013-Fix-build-with-GCC-15-as-host-compiler.patch @@ -0,0 +1,39 @@ +From 281151d85240bd8a60545b6415e0f44ce6a2af33 Mon Sep 17 00:00:00 2001 +From: Alper Nebi Yasak <alpernebiyasak@gmail.com> +Date: Tue, 29 Apr 2025 17:31:13 +0300 +Subject: [PATCH] WIP: Fix build with GCC 15 as host compiler + +GCC 15 now considers the unterminated-string-initialization warning as +part of -Werror by default. Coreboot compiles host utilities with the +system compiler, which results in getting this error in some files. + +Mark a hexadecimal translation table in cbfstool code as "nonstring" to +avoid the warning-turned-error. + +The bios log prefixes are non-null-terminated as well, but I couldn't +figure out how to mark them as non-strings. Temporarily disable the +warning with a pragma to avoid the error. That pragma causes an error on +GCC 14, so disable pragma warnings along with it to avoid that as well. + +Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> +--- + util/cbfstool/common.c | 2 +- + 1 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c +index 7154bc9d5425..cb08c9e8ec11 100644 +--- a/util/cbfstool/common.c ++++ b/util/cbfstool/common.c +@@ -192,7 +192,7 @@ uint64_t intfiletype(const char *name) + + char *bintohex(uint8_t *data, size_t len) + { +- static const char translate[16] = "0123456789abcdef"; ++ static const char translate[16] __attribute__((__nonstring__)) = "0123456789abcdef"; + + char *result = malloc(len * 2 + 1); + if (result == NULL) + +-- +2.49.0 + diff --git a/config/coreboot/fam15h/patches/0014-util-romcc-Fix-build-with-GCC-15.patch b/config/coreboot/fam15h/patches/0014-util-romcc-Fix-build-with-GCC-15.patch new file mode 100644 index 00000000..d9de94c6 --- /dev/null +++ b/config/coreboot/fam15h/patches/0014-util-romcc-Fix-build-with-GCC-15.patch @@ -0,0 +1,119 @@ +From 74dc3c0a4603bc635c8bc5e95490cdf168af5f41 Mon Sep 17 00:00:00 2001 +From: Alper Nebi Yasak <alpernebiyasak@gmail.com> +Date: Tue, 29 Apr 2025 19:46:14 +0300 +Subject: [PATCH] util/romcc: Fix build with GCC 15 + +With GCC 15, we get build errors complaining bool is a reserved keyword, +so cannot be used as a function name. Rename our bool() to bool_(). + +Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> +--- + util/romcc/romcc.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c +index 378bfc50f290..b375e0fc83cb 100644 +--- a/util/romcc/romcc.c ++++ b/util/romcc/romcc.c +@@ -7137,7 +7137,7 @@ static void integral(struct compile_state *state, struct triple *def) + } + + +-static void bool(struct compile_state *state, struct triple *def) ++static void bool_(struct compile_state *state, struct triple *def) + { + if (!TYPE_ARITHMETIC(def->type->type) && + ((def->type->type & TYPE_MASK) != TYPE_POINTER)) { +@@ -7705,7 +7705,7 @@ static struct triple *mkcond_expr( + struct triple *def, *val, *var, *jmp1, *jmp2, *top, *mid, *end; + struct type *result_type; + unsigned int left_type, right_type; +- bool(state, test); ++ bool_(state, test); + left_type = left->type->type; + right_type = right->type->type; + result_type = 0; +@@ -11036,7 +11036,7 @@ static struct triple *unary_expr(struct compile_state *state) + case TOK_BANG: + eat(state, TOK_BANG); + right = read_expr(state, cast_expr(state)); +- bool(state, right); ++ bool_(state, right); + def = lfalse_expr(state, right); + break; + case TOK_SIZEOF: +@@ -11363,10 +11363,10 @@ static struct triple *land_expr(struct compile_state *state) + while(peek(state) == TOK_LOGAND) { + struct triple *left, *right; + left = read_expr(state, def); +- bool(state, left); ++ bool_(state, left); + eat(state, TOK_LOGAND); + right = read_expr(state, or_expr(state)); +- bool(state, right); ++ bool_(state, right); + + def = mkland_expr(state, + ltrue_expr(state, left), +@@ -11382,10 +11382,10 @@ static struct triple *lor_expr(struct compile_state *state) + while(peek(state) == TOK_LOGOR) { + struct triple *left, *right; + left = read_expr(state, def); +- bool(state, left); ++ bool_(state, left); + eat(state, TOK_LOGOR); + right = read_expr(state, land_expr(state)); +- bool(state, right); ++ bool_(state, right); + + def = mklor_expr(state, + ltrue_expr(state, left), +@@ -11400,7 +11400,7 @@ static struct triple *conditional_expr(struct compile_state *state) + def = lor_expr(state); + if (peek(state) == TOK_QUEST) { + struct triple *test, *left, *right; +- bool(state, def); ++ bool_(state, def); + test = ltrue_expr(state, read_expr(state, def)); + eat(state, TOK_QUEST); + left = read_expr(state, expr(state)); +@@ -11676,7 +11676,7 @@ static void if_statement(struct compile_state *state, struct triple *first) + eat(state, TOK_IF); + eat(state, TOK_LPAREN); + test = expr(state); +- bool(state, test); ++ bool_(state, test); + /* Cleanup and invert the test */ + test = lfalse_expr(state, read_expr(state, test)); + eat(state, TOK_RPAREN); +@@ -11719,7 +11719,7 @@ static void for_statement(struct compile_state *state, struct triple *first) + eat(state, TOK_SEMI); + if (peek(state) != TOK_SEMI) { + test = expr(state); +- bool(state, test); ++ bool_(state, test); + test = ltrue_expr(state, read_expr(state, test)); + } + eat(state, TOK_SEMI); +@@ -11767,7 +11767,7 @@ static void while_statement(struct compile_state *state, struct triple *first) + eat(state, TOK_WHILE); + eat(state, TOK_LPAREN); + test = expr(state); +- bool(state, test); ++ bool_(state, test); + test = ltrue_expr(state, read_expr(state, test)); + eat(state, TOK_RPAREN); + /* Generate the needed pieces */ +@@ -11818,7 +11818,7 @@ static void do_statement(struct compile_state *state, struct triple *first) + eat(state, TOK_WHILE); + eat(state, TOK_LPAREN); + test = read_expr(state, expr(state)); +- bool(state, test); ++ bool_(state, test); + eat(state, TOK_RPAREN); + eat(state, TOK_SEMI); + /* Thread the pieces together */ + +-- +2.49.0 + diff --git a/config/coreboot/fam15h/patches/0015-gmp-gcc15-patch.patch b/config/coreboot/fam15h/patches/0015-gmp-gcc15-patch.patch new file mode 100644 index 00000000..40ea7c14 --- /dev/null +++ b/config/coreboot/fam15h/patches/0015-gmp-gcc15-patch.patch @@ -0,0 +1,65 @@ +From 8663b2a75d69aa241f86dd6e813232343a05b609 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Tue, 29 Apr 2025 21:26:25 +0100 +Subject: [PATCH 1/1] gmp gcc15 patch + +https://gmplib.org/list-archives/gmp-devel/2025-January/006279.html + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + ...include.m4-fix-std-c23-build-failure.patch | 43 +++++++++++++++++++ + 1 file changed, 43 insertions(+) + create mode 100644 util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure.patch + +diff --git a/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure.patch b/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure.patch +new file mode 100644 +index 0000000000..adb66c6043 +--- /dev/null ++++ b/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure.patch +@@ -0,0 +1,43 @@ ++From 7d4aa08224b53054754b8ee6fd61a4297ac47119 Mon Sep 17 00:00:00 2001 ++From: Rudi Heitbaum <rudi@heitbaum.com> ++Date: Wed, 22 Jan 2025 02:34:09 +0100 ++Subject: [PATCH 1/1] acinclude.m4: fix -std=c23 build failure ++ ++Add prototype to configure test function as c23 removes unprototyped ++functions. ++ ++gcc-15 switched to -std=c23 by default: ++ ++ https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 ++ ++As a result `configure` fails with: ++ conftest.c: In function 'f': ++ conftest.c:12:48: error: too many arguments to function 'g'; expected 0, have 6 ++ 12 | for(i=0;i<1;i++){if(e(got,got,9,d[i].n)==0)h();g(i,d[i].src,d[i].n,got,d[i].want,9);if(d[i].n)h();}} ++ | ^ ~ ++ conftest.c:7:6: note: declared here ++ 7 | void g(){} ++ | ^ ++ ++Link: https://gmplib.org/list-archives/gmp-bugs/2024-November/005550.html ++Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com> ++--- ++ acinclude.m4 | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++diff --git a/acinclude.m4 b/acinclude.m4 ++index 3c3ecf5..3a226fd 100644 ++--- a/acinclude.m4 +++++ b/acinclude.m4 ++@@ -609,7 +609,7 @@ GMP_PROG_CC_WORKS_PART([$1], [long long reliability test 1], ++ ++ #if defined (__GNUC__) && ! defined (__cplusplus) ++ typedef unsigned long long t1;typedef t1*t2; ++-void g(){} +++void g(int,const t1 *,t1,t1 *,const t1 *,int){} ++ void h(){} ++ static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) ++ {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;} ++-- ++2.39.5 ++ +-- +2.39.5 + diff --git a/config/coreboot/fam15h/patches/0016-further-fix-for-std-c23-on-gmp-with-host-gcc-15.patch b/config/coreboot/fam15h/patches/0016-further-fix-for-std-c23-on-gmp-with-host-gcc-15.patch new file mode 100644 index 00000000..1287a02d --- /dev/null +++ b/config/coreboot/fam15h/patches/0016-further-fix-for-std-c23-on-gmp-with-host-gcc-15.patch @@ -0,0 +1,55 @@ +From 8c3a1163eb24a608ad14747cd40169fb5a41d4f9 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Tue, 29 Apr 2025 23:18:56 +0100 +Subject: [PATCH 1/1] further fix for std=c23 on gmp with host gcc-15 + +the fix had to be applied in the configure file, so that +the correct function call is generated in conftest.c + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + ...e.m4-fix-std-c23-build-failure-extra.patch | 32 +++++++++++++++++++ + 1 file changed, 32 insertions(+) + create mode 100644 util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure-extra.patch + +diff --git a/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure-extra.patch b/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure-extra.patch +new file mode 100644 +index 0000000000..40569b27d8 +--- /dev/null ++++ b/util/crossgcc/patches/gmp-6.1.2_acinclude.m4-fix-std-c23-build-failure-extra.patch +@@ -0,0 +1,32 @@ ++From 6316016cfe6834b6d3242e7e088b7d2af91ada22 Mon Sep 17 00:00:00 2001 ++From: Leah Rowe <leah@libreboot.org> ++Date: Tue, 29 Apr 2025 23:16:51 +0100 ++Subject: [PATCH 1/1] further -std=23 gcc-15 fix for gmp ++ ++the previously merged revision was correct, but ++applied in the wrong place. the conftest.c file ++was being generated by configure, in this place. ++ ++this should fix build errors now, on gcc-15. ++ ++Signed-off-by: Leah Rowe <leah@libreboot.org> ++--- ++ configure | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++diff --git a/configure b/configure ++index 12ddffd..8b07818 100755 ++--- a/configure +++++ b/configure ++@@ -6458,7 +6458,7 @@ if test "$gmp_prog_cc_works" = yes; then ++ ++ #if defined (__GNUC__) && ! defined (__cplusplus) ++ typedef unsigned long long t1;typedef t1*t2; ++-void g(){} +++void g(int,const t1 *,t1,t1 *,const t1 *,int){} ++ void h(){} ++ static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) ++ {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;} ++-- ++2.39.5 ++ +-- +2.39.5 + diff --git a/config/coreboot/fam15h/patches/0017-xgcc-update-nasm-to-2.16.03.patch b/config/coreboot/fam15h/patches/0017-xgcc-update-nasm-to-2.16.03.patch new file mode 100644 index 00000000..8dc52ac9 --- /dev/null +++ b/config/coreboot/fam15h/patches/0017-xgcc-update-nasm-to-2.16.03.patch @@ -0,0 +1,44 @@ +From 0d639c485bdf136e4c5ac7af81fc12da3f21bc46 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Wed, 30 Apr 2025 04:07:31 +0100 +Subject: [PATCH 1/1] xgcc: update nasm to 2.16.03 + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + util/crossgcc/buildgcc | 2 +- + util/crossgcc/sum/nasm-2.14.02.tar.bz2.cksum | 1 - + util/crossgcc/sum/nasm-2.16.03.tar.bz2.cksum | 1 + + 3 files changed, 2 insertions(+), 2 deletions(-) + delete mode 100644 util/crossgcc/sum/nasm-2.14.02.tar.bz2.cksum + create mode 100644 util/crossgcc/sum/nasm-2.16.03.tar.bz2.cksum + +diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc +index 0ad1980104..2d48ff038e 100755 +--- a/util/crossgcc/buildgcc ++++ b/util/crossgcc/buildgcc +@@ -61,7 +61,7 @@ EXPAT_VERSION=2.2.7 + CLANG_VERSION=8.0.0 + MAKE_VERSION=4.2.1 + CMAKE_VERSION=3.15.3 +-NASM_VERSION=2.14.02 ++NASM_VERSION=2.16.03 + + # GCC toolchain archive locations + # These are sanitized by the jenkins toolchain test builder, so if +diff --git a/util/crossgcc/sum/nasm-2.14.02.tar.bz2.cksum b/util/crossgcc/sum/nasm-2.14.02.tar.bz2.cksum +deleted file mode 100644 +index f3b9de9d29..0000000000 +--- a/util/crossgcc/sum/nasm-2.14.02.tar.bz2.cksum ++++ /dev/null +@@ -1 +0,0 @@ +-fe098ee4dc9c4c983696c4948e64b23e4098b92b tarballs/nasm-2.14.02.tar.bz2 +diff --git a/util/crossgcc/sum/nasm-2.16.03.tar.bz2.cksum b/util/crossgcc/sum/nasm-2.16.03.tar.bz2.cksum +new file mode 100644 +index 0000000000..9ca23fb0c4 +--- /dev/null ++++ b/util/crossgcc/sum/nasm-2.16.03.tar.bz2.cksum +@@ -0,0 +1 @@ ++c63080347a5c1c8904456fe6c680b722558383b4 tarballs/nasm-2.16.03.tar.bz2 +-- +2.39.5 + diff --git a/config/coreboot/fam15h/patches/0018-fix-arch-linux-build-error.patch b/config/coreboot/fam15h/patches/0018-fix-arch-linux-build-error.patch new file mode 100644 index 00000000..d712f444 --- /dev/null +++ b/config/coreboot/fam15h/patches/0018-fix-arch-linux-build-error.patch @@ -0,0 +1,30 @@ +From 0e6a5b0e82309715683ce3033dc34897852827e5 Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Wed, 1 Apr 2026 08:25:07 +0100 +Subject: [PATCH 1/1] fix arch linux build error + +fixes cbfstool builds on arch linux on this old coreboot + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + src/commonlib/include/commonlib/helpers.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/commonlib/include/commonlib/helpers.h b/src/commonlib/include/commonlib/helpers.h +index ca3b3c58f9..e28b5c4c37 100644 +--- a/src/commonlib/include/commonlib/helpers.h ++++ b/src/commonlib/include/commonlib/helpers.h +@@ -133,10 +133,6 @@ + /* Calculate size of structure member. */ + #define member_size(type, member) (sizeof(((type *)0)->member)) + +-#ifndef __unused +-#define __unused __attribute__((unused)) +-#endif +- + #ifndef alloca + #define alloca(x) __builtin_alloca(x) + #endif +-- +2.47.3 + diff --git a/config/coreboot/fam15h/patches/0019-never-use-Werror.patch b/config/coreboot/fam15h/patches/0019-never-use-Werror.patch new file mode 100644 index 00000000..e1293d92 --- /dev/null +++ b/config/coreboot/fam15h/patches/0019-never-use-Werror.patch @@ -0,0 +1,564 @@ +From 16e721d8f1edf098c88bd7693f30f52f0b36153e Mon Sep 17 00:00:00 2001 +From: Leah Rowe <leah@libreboot.org> +Date: Thu, 23 Apr 2026 20:33:55 +0100 +Subject: [PATCH 1/1] never use -Werror + +Signed-off-by: Leah Rowe <leah@libreboot.org> +--- + Makefile.inc | 5 +- + payloads/bayou/Makefile | 2 +- + payloads/coreinfo/Makefile | 2 +- + payloads/external/tint/libpayload_tint.patch | 52 ++++++++++---------- + payloads/libpayload/Makefile.inc | 2 +- + payloads/libpayload/sample/Makefile | 2 +- + payloads/linuxcheck/Makefile | 2 +- + payloads/nvramcui/Makefile | 2 +- + src/lib/gnat/Makefile.inc | 1 - + util/bimgtool/Makefile | 2 +- + util/cbfstool/Makefile.inc | 2 +- + util/cbfstool/lz4/Makefile | 8 +-- + util/cbmem/Makefile | 2 +- + util/ifdtool/Makefile | 2 +- + util/intelvbttool/Makefile | 2 +- + util/k8resdump/Makefile | 2 +- + util/msrtool/configure | 2 +- + util/pmh7tool/Makefile | 2 +- + util/romcc/Makefile | 2 +- + util/superiotool/Makefile | 6 +-- + util/uio_usbdebug/Makefile | 2 +- + util/xcompile/xcompile | 2 +- + 22 files changed, 51 insertions(+), 55 deletions(-) + +diff --git a/Makefile.inc b/Makefile.inc +index be198d6580..54f8d7aa14 100644 +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -435,7 +435,7 @@ endif + endif + + ADAFLAGS_common += -gnatp +-ADAFLAGS_common += -Wuninitialized -Wall -Werror ++ADAFLAGS_common += -Wuninitialized -Wall + ADAFLAGS_common += -pipe -g -nostdinc + ADAFLAGS_common += -Wstrict-aliasing -Wshadow + ADAFLAGS_common += -fno-common -fomit-frame-pointer +@@ -480,9 +480,6 @@ ADAFLAGS_common += -gnatyN + + LDFLAGS_common := --gc-sections -nostdlib --nmagic -static --emit-relocs + +-ifeq ($(CONFIG_WARNINGS_ARE_ERRORS),y) +-CFLAGS_common += -Werror +-endif + ifneq ($(GDB_DEBUG),) + CFLAGS_common += -Og + ADAFLAGS_common += -Og +diff --git a/payloads/bayou/Makefile b/payloads/bayou/Makefile +index 7a4b08b484..0412704ff5 100644 +--- a/payloads/bayou/Makefile ++++ b/payloads/bayou/Makefile +@@ -39,7 +39,7 @@ OBJECTS-$(CONFIG_LZMA) += lzma.o + OBJECTS-$(CONFIG_NRV2B) += nrv2b.o + OBJECTS-$(CONFIG_BUILTIN_LAR) += builtin-lar.o + +-CFLAGS= -Wall -Werror -Os $(FFLAGS-y) ++CFLAGS= -Wall -Os $(FFLAGS-y) + LDFLAGS=-Wl,-T,bayou.ldscript -static + LIBGCC=$(shell $(CC) -m32 -print-libgcc-file-name) + +diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile +index 34c45d9855..a1c058e794 100644 +--- a/payloads/coreinfo/Makefile ++++ b/payloads/coreinfo/Makefile +@@ -83,7 +83,7 @@ OBJCOPY := $(OBJCOPY_$(ARCH-y)) + LPCC := CC="$(CC)" $(LIBPAYLOAD_OBJ)/bin/lpgcc + LPAS := AS="$(AS)" $(LIBPAYLOAD_OBJ)/bin/lpas + +-CFLAGS += -Wall -Wextra -Wmissing-prototypes -Wvla -Werror ++CFLAGS += -Wall -Wextra -Wmissing-prototypes -Wvla + CFLAGS += -Os -fno-builtin $(CFLAGS_$(ARCH-y)) $(INCLUDES) + + ifneq ($(strip $(HAVE_DOTCONFIG)),) +diff --git a/payloads/external/tint/libpayload_tint.patch b/payloads/external/tint/libpayload_tint.patch +index 34246a6561..91196d2fe4 100644 +--- a/payloads/external/tint/libpayload_tint.patch ++++ b/payloads/external/tint/libpayload_tint.patch +@@ -4,7 +4,7 @@ diff -rupN tint-0.04+nmu1/config.h tint/config.h + @@ -29,7 +29,15 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +- ++ + +#include <libpayload.h> + +#include <curses.h> + + +@@ -15,7 +15,7 @@ diff -rupN tint-0.04+nmu1/config.h tint/config.h + +#if 0 + const char scorefile[] = SCOREFILE; + +#endif +- ++ + #endif /* #ifndef CONFIG_H */ + diff -rupN tint-0.04+nmu1/engine.c tint/engine.c + --- tint-0.04+nmu1/engine.c 2005-07-17 13:26:22.000000000 +0200 +@@ -23,14 +23,14 @@ diff -rupN tint-0.04+nmu1/engine.c tint/engine.c + @@ -27,10 +27,13 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +- ++ + +#include "config.h" + + + +#if 0 + #include <stdlib.h> + #include <string.h> + +#endif +- ++ + -#include "typedefs.h" + #include "utils.h" + #include "io.h" +@@ -53,7 +53,7 @@ diff -rupN tint-0.04+nmu1/io.c tint/io.c + @@ -27,9 +27,13 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +- ++ + +#include "config.h" + + + +#if 0 +@@ -61,9 +61,9 @@ diff -rupN tint-0.04+nmu1/io.c tint/io.c + #include <sys/time.h> /* gettimeofday() */ + #include <unistd.h> /* gettimeofday() */ + +#endif +- ++ + #include "io.h" +- ++ + @@ -68,7 +72,11 @@ static int in_timeleft; + /* Initialize screen */ + void io_init () +@@ -101,7 +101,7 @@ diff -rupN tint-0.04+nmu1/io.c tint/io.c + +#endif + return ch; + } +- ++ + diff -rupN tint-0.04+nmu1/io.h tint/io.h + --- tint-0.04+nmu1/io.h 2010-06-23 14:55:03.000000000 +0100 + +++ tint/io.h 2018-02-23 12:00:00.000000000 +0200 +@@ -238,7 +238,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c + @@ -27,6 +26,7 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +- ++ + +#if 0 + #include <stdlib.h> + #include <stdio.h> +@@ -248,7 +248,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c + #include <sys/types.h> + #include <unistd.h> + +#endif +- ++ + -#include "typedefs.h" + #include "utils.h" + #include "io.h" +@@ -263,7 +263,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c + @@ -322,6 +322,7 @@ typedef struct + time_t timestamp; + } score_t; +- ++ + +#if 0 + static void getname (char *name) + { +@@ -273,7 +273,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c + } + } + +#endif +- ++ + +#if 0 + static void err1 () + { +@@ -283,7 +283,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c + exit (EXIT_FAILURE); + } + +#endif +- ++ + void showplayerstats (engine_t *engine) + { + - fprintf (stderr, +@@ -294,7 +294,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c + @@ -361,6 +365,7 @@ void showplayerstats (engine_t *engine) + GETSCORE (engine->score),engine->status.efficiency,GETSCORE (engine->score) / getsum ()); + } +- ++ + +#if 0 + static void createscores (int score) + { +@@ -304,7 +304,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c + fprintf (stderr,"\t 1* %7d %s\n\n",score,scores[0].name); + } + +#endif +- ++ + +#if 0 + static int cmpscores (const void *a,const void *b) + { +@@ -314,7 +314,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c + return 0; + } + +#endif +- ++ + +#if 0 + static void savescores (int score) + { +@@ -324,11 +324,11 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c + fprintf (stderr,"\n"); + } + +#endif +- ++ + /***************************************************************************/ + /***************************************************************************/ + /***************************************************************************/ +- ++ + +#if 0 + static void showhelp () + { +@@ -338,7 +338,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c + exit (EXIT_FAILURE); + } + +#endif +- ++ + static void parse_options (int argc,char *argv[]) + { + +#if 0 +@@ -351,12 +351,12 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c + } + +#endif + } +- ++ + static void choose_level () + { + +#if 0 + char buf[NAMELEN]; +- ++ + do + @@ -557,6 +572,8 @@ static void choose_level () + buf[strlen (buf) - 1] = '\0'; +@@ -365,7 +365,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c + +#endif + + level = 1; + } +- ++ + /***************************************************************************/ + @@ -569,6 +586,8 @@ int main (int argc,char *argv[]) + int ch; +@@ -425,14 +425,14 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c + exit (EXIT_SUCCESS); + +#endif + } +- ++ + diff -rupN tint-0.04+nmu1/utils.c tint/utils.c + --- tint-0.04+nmu1/utils.c 2001-12-07 16:49:19.000000000 +0100 + +++ tint/utils.c 2018-02-23 12:00:00.000000000 +0200 + @@ -27,11 +27,13 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +- ++ + +#include "config.h" + + + +#if 0 +@@ -442,7 +442,7 @@ diff -rupN tint-0.04+nmu1/utils.c tint/utils.c + - + -#include "typedefs.h" + +#endif +- ++ + /* + * Initialize random number generator + @@ -61,6 +63,7 @@ int rand_value (int range) +@@ -456,7 +456,7 @@ diff -rupN tint-0.04+nmu1/utils.c tint/utils.c + @@ -69,3 +72,4 @@ bool str2int (int *i,const char *str) + return TRUE; + } +- ++ + +#endif + diff -rupN tint-0.04+nmu1/utils.h tint/utils.h + --- tint-0.04+nmu1/utils.h 2001-12-07 16:49:35.000000000 +0100 +diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc +index 4863d3f1da..0da4098fa0 100644 +--- a/payloads/libpayload/Makefile.inc ++++ b/payloads/libpayload/Makefile.inc +@@ -64,7 +64,7 @@ CFLAGS += -nostdlib -fno-builtin -ffreestanding -fomit-frame-pointer + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wvla + CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs -Wimplicit-fallthrough +-CFLAGS += -Wstrict-aliasing -Wshadow -Werror ++CFLAGS += -Wstrict-aliasing -Wshadow + + $(obj)/libpayload-config.h: $(KCONFIG_AUTOHEADER) + cmp $@ $< 2>/dev/null || cp $< $@ +diff --git a/payloads/libpayload/sample/Makefile b/payloads/libpayload/sample/Makefile +index 18121dfe80..1bf6eb521b 100644 +--- a/payloads/libpayload/sample/Makefile ++++ b/payloads/libpayload/sample/Makefile +@@ -41,7 +41,7 @@ AS := $(AS_$(ARCH-y)) + LIBPAYLOAD_DIR := ../install/libpayload + XCC := CC="$(CC)" $(LIBPAYLOAD_DIR)/bin/lpgcc + XAS := AS="$(AS)" $(LIBPAYLOAD_DIR)/bin/lpas +-CFLAGS := -fno-builtin -Wall -Werror -Os ++CFLAGS := -fno-builtin -Wall -Os + TARGET := hello + OBJS := $(TARGET).o + +diff --git a/payloads/linuxcheck/Makefile b/payloads/linuxcheck/Makefile +index 838c90df0c..a9d016db36 100644 +--- a/payloads/linuxcheck/Makefile ++++ b/payloads/linuxcheck/Makefile +@@ -3,7 +3,7 @@ XCOMPILE=$(LIBPAYLOAD_DIR)/libpayload.xcompile + # build libpayload and put .config file in $(CURDIR) instead of ../libpayload + # to avoid pollute the libpayload source directory and possible conflicts + LPOPTS=obj="$(CURDIR)/build" DESTDIR="$(CURDIR)" DOTCONFIG="$(CURDIR)/.config" +-CFLAGS += -Wall -Wvla -Werror -Os -ffreestanding -nostdinc -nostdlib ++CFLAGS += -Wall -Wvla -Os -ffreestanding -nostdinc -nostdlib + ifeq ($(CONFIG_ARCH_X86),y) + TARGETARCH = i386 + endif +diff --git a/payloads/nvramcui/Makefile b/payloads/nvramcui/Makefile +index bf7053b9a6..2255bf1558 100644 +--- a/payloads/nvramcui/Makefile ++++ b/payloads/nvramcui/Makefile +@@ -3,7 +3,7 @@ XCOMPILE=$(LIBPAYLOAD_DIR)/libpayload.xcompile + # build libpayload and put .config file in $(CURDIR) instead of ../libpayload + # to avoid pollute the libpayload source directory and possible conflicts + LPOPTS=obj="$(CURDIR)/build" DESTDIR="$(CURDIR)" DOTCONFIG="$(CURDIR)/.config" +-CFLAGS += -Wall -Wvla -Werror -Os -ffreestanding -nostdinc -nostdlib ++CFLAGS += -Wall -Wvla -Os -ffreestanding -nostdinc -nostdlib + + all: nvramcui.elf + +diff --git a/src/lib/gnat/Makefile.inc b/src/lib/gnat/Makefile.inc +index ebd04862bf..c8886ec0aa 100644 +--- a/src/lib/gnat/Makefile.inc ++++ b/src/lib/gnat/Makefile.inc +@@ -25,7 +25,6 @@ ADAFLAGS_libgnat-$(1) := \ + -gnatpg \ + -I$$(src)/lib/gnat/ \ + $$(GCC_ADAFLAGS_$(1)) \ +- -Werror \ + + libgnat-$(1)-y += a-unccon.ads + libgnat-$(1)-y += ada.ads +diff --git a/util/bimgtool/Makefile b/util/bimgtool/Makefile +index 05ddf7d757..e9a49f1515 100644 +--- a/util/bimgtool/Makefile ++++ b/util/bimgtool/Makefile +@@ -5,7 +5,7 @@ CFLAGS ?= -g + CFLAGS += -D_7ZIP_ST + CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes + CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs +-CFLAGS += -Wstrict-aliasing -Wshadow -Werror ++CFLAGS += -Wstrict-aliasing -Wshadow + + all: $(obj)/bimgtool + +diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc +index 95372c2988..7ff88915c7 100644 +--- a/util/cbfstool/Makefile.inc ++++ b/util/cbfstool/Makefile.inc +@@ -104,7 +104,7 @@ amdcompobj += elfheaders.o + amdcompobj += common.o + amdcompobj += xdr.o + +-TOOLCFLAGS ?= -Werror -Wall -Wextra ++TOOLCFLAGS ?= -Wall -Wextra + TOOLCFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow + TOOLCFLAGS += -Wstrict-prototypes -Wwrite-strings + TOOLCFLAGS += -O2 +diff --git a/util/cbfstool/lz4/Makefile b/util/cbfstool/lz4/Makefile +index 931da35d95..4c7c640756 100644 +--- a/util/cbfstool/lz4/Makefile ++++ b/util/cbfstool/lz4/Makefile +@@ -93,10 +93,10 @@ cmake: + @cd cmake_unofficial; cmake CMakeLists.txt; $(MAKE) + + gpptest: clean +- $(MAKE) all CC=g++ CFLAGS="-O3 -I../lib -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror" ++ $(MAKE) all CC=g++ CFLAGS="-O3 -I../lib -Wall -Wextra -Wundef -Wshadow -Wcast-align" + + clangtest: clean +- CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) all CC=clang ++ CFLAGS="-O3 -Wconversion -Wno-sign-conversion" $(MAKE) all CC=clang + + sanitize: clean + CFLAGS="-O3 -g -fsanitize=undefined" $(MAKE) test CC=clang FUZZER_TIME="-T1mn" NB_LOOPS=-i1 +@@ -105,8 +105,8 @@ staticAnalyze: clean + CFLAGS=-g scan-build --status-bugs -v $(MAKE) all + + armtest: clean +- CFLAGS="-O3 -Werror" $(MAKE) -C $(LZ4DIR) all CC=arm-linux-gnueabi-gcc +- CFLAGS="-O3 -Werror" $(MAKE) -C $(PRGDIR) bins CC=arm-linux-gnueabi-gcc ++ CFLAGS="-O3" $(MAKE) -C $(LZ4DIR) all CC=arm-linux-gnueabi-gcc ++ CFLAGS="-O3" $(MAKE) -C $(PRGDIR) bins CC=arm-linux-gnueabi-gcc + + versionsTest: clean + $(MAKE) -C versionsTest +diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile +index 485955b68a..483b7a0fab 100644 +--- a/util/cbmem/Makefile ++++ b/util/cbmem/Makefile +@@ -19,7 +19,7 @@ CC ?= $(CROSS_COMPILE)gcc + INSTALL ?= /usr/bin/env install + PREFIX ?= /usr/local + CFLAGS ?= -O2 +-CFLAGS += -Wall -Wextra -Wmissing-prototypes -Werror ++CFLAGS += -Wall -Wextra -Wmissing-prototypes + CPPFLAGS += -I . -I $(ROOT)/commonlib/include + CPPFLAGS += -include ../../src/commonlib/include/commonlib/compiler.h + +diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile +index a4f0af6217..bca4b01d88 100644 +--- a/util/ifdtool/Makefile ++++ b/util/ifdtool/Makefile +@@ -18,7 +18,7 @@ PROGRAM = ifdtool + CC = gcc + INSTALL = /usr/bin/env install + PREFIX = /usr/local +-CFLAGS = -O2 -g -Wall -Wextra -Wmissing-prototypes -Werror ++CFLAGS = -O2 -g -Wall -Wextra -Wmissing-prototypes + CFLAGS += -I../../src/commonlib/include + CFLAGS += -I../cbfstool/flashmap + CFLAGS += -include ../../src/commonlib/include/commonlib/compiler.h +diff --git a/util/intelvbttool/Makefile b/util/intelvbttool/Makefile +index fb9aadefda..5728b7a36c 100644 +--- a/util/intelvbttool/Makefile ++++ b/util/intelvbttool/Makefile +@@ -16,7 +16,7 @@ + PROGRAM = intelvbttool + CC ?= gcc + CFLAGS ?= -O2 -g +-CFLAGS += -Wall -Werror ++CFLAGS += -Wall + CFLAGS += -I../../src/commonlib/include + + all: $(PROGRAM) +diff --git a/util/k8resdump/Makefile b/util/k8resdump/Makefile +index a1d4dfa682..fc039bae4f 100644 +--- a/util/k8resdump/Makefile ++++ b/util/k8resdump/Makefile +@@ -19,7 +19,7 @@ CC = gcc + INSTALL = /usr/bin/env install + PREFIX = /usr/local + #CFLAGS = -O2 -g -Wall -Werror +-CFLAGS = -Os -Wall -Werror ++CFLAGS = -Os -Wall + OS_ARCH = $(shell uname) + ifeq ($(OS_ARCH), SunOS) + LDFLAGS = -lpci +diff --git a/util/msrtool/configure b/util/msrtool/configure +index 0606f4b8b9..ef4d9f99cd 100755 +--- a/util/msrtool/configure ++++ b/util/msrtool/configure +@@ -136,7 +136,7 @@ CC=`findprog "compiler" "${CC}" gcc cc icc` || exit + INSTALL=`findprog "install" "${INSTALL}" install ginstall` || exit + + test -n "$DEBUG" && myCFLAGS="-O2 -g" || myCFLAGS="-Os" +-CFLAGS="${CFLAGS} ${myCFLAGS} -Wall -Werror" ++CFLAGS="${CFLAGS} ${myCFLAGS} -Wall" + + cat > .config.c << EOF + #include <pci/pci.h> +diff --git a/util/pmh7tool/Makefile b/util/pmh7tool/Makefile +index 034ed40c59..d5496bc59f 100644 +--- a/util/pmh7tool/Makefile ++++ b/util/pmh7tool/Makefile +@@ -14,7 +14,7 @@ + ## + + CC = gcc +-CFLAGS = -O2 -Wall -Wextra -Werror ++CFLAGS = -O2 -Wall -Wextra + PROGRAM = pmh7tool + INSTALL = /usr/bin/env install + PREFIX = /usr/local +diff --git a/util/romcc/Makefile b/util/romcc/Makefile +index 2c5f174cf2..a06b490fd0 100644 +--- a/util/romcc/Makefile ++++ b/util/romcc/Makefile +@@ -1,6 +1,6 @@ + CC=gcc + CPPFLAGS= +-CFLAGS= -g -Wall -Werror $(CPPFLAGS) ++CFLAGS= -g -Wall $(CPPFLAGS) + CPROF_FLAGS=-pg -fprofile-arcs + BUILD_DIR=build + +diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile +index 2bc88aba64..ac904d1078 100644 +--- a/util/superiotool/Makefile ++++ b/util/superiotool/Makefile +@@ -25,7 +25,7 @@ PREFIX ?= /usr/local + VERSION := -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"' + + CFLAGS += -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \ +- -Werror-implicit-function-declaration -ansi -pedantic $(VERSION) ++ -ansi -pedantic $(VERSION) + LDFLAGS += -lz + + OBJS = superiotool.o serverengines.o ali.o exar.o fintek.o ite.o nsc.o \ +@@ -36,8 +36,8 @@ ifeq ($(OS_ARCH), Darwin) + LIBS = -framework IOKit -framework DirectHW -lpci -lz + endif + ifeq ($(OS_ARCH), FreeBSD) +-CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \ +- -Werror-implicit-function-declaration -ansi $(VERSION) \ ++CFLAGS = -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \ ++ -ansi $(VERSION) \ + -I/usr/local/include + LDFLAGS += -L/usr/local/lib + LIBS = -lz +diff --git a/util/uio_usbdebug/Makefile b/util/uio_usbdebug/Makefile +index 74bc80e2e6..c1bbc88737 100644 +--- a/util/uio_usbdebug/Makefile ++++ b/util/uio_usbdebug/Makefile +@@ -28,7 +28,7 @@ KCONFIG_H := ../../src/include/kconfig.h + + CFLAGS += \ + -m32 -g \ +- -Wall -Wextra -Werror \ ++ -Wall -Wextra \ + -Wno-unused-parameter -Wno-error=sign-compare + CPPFLAGS += \ + -Iinclude/ \ +diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile +index 2d3da1e00e..a5a948cb19 100755 +--- a/util/xcompile/xcompile ++++ b/util/xcompile/xcompile +@@ -112,7 +112,7 @@ testcc() { + local tmp_o="$TMPFILE.o" + rm -f "$tmp_c" "$tmp_o" + echo "void _start(void) {}" >"$tmp_c" +- "$cc" -nostdlib -Werror $cflags -c "$tmp_c" -o "$tmp_o" >/dev/null 2>&1 ++ "$cc" -nostdlib $cflags -c "$tmp_c" -o "$tmp_o" >/dev/null 2>&1 + } + + testld() { +-- +2.47.3 + |