Elyes Haouas has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/85060?usp=email )
Change subject: [only for test] use errno_t ......................................................................
[only for test] use errno_t
Change-Id: I97208106f801899f5e0de019d1de8ccf56513f36 Signed-off-by: Elyes Haouas ehaouas@noos.fr --- M Makefile.mk M payloads/libpayload/Makefile M payloads/libpayload/curses/PDCurses/x11/pdcx11.c M payloads/libpayload/curses/curses.priv.h M payloads/libpayload/curses/menu/mf_common.h M payloads/libpayload/libc/string.c M payloads/libpayload/tests/Makefile.mk M src/commonlib/bsd/include/commonlib/bsd/stdlib.h M src/lib/libgcov.c M util/amdfwtool/amdfwtool.c M util/amdfwtool/handle_file.c M util/amdfwtool/signed_psp.c M util/archive/archive.c M util/bucts/bucts.c M util/cbfstool/Makefile.mk M util/cbfstool/cse_fpt.c M util/cbfstool/cse_serger.c M util/cbfstool/flashmap/fmap.c M util/cbfstool/lz4/lib/Makefile M util/cbmem/cbmem.c M util/intelmetool/mmap.c M util/intelmetool/msr.c M util/inteltool/cpu.c M util/inteltool/inteltool.c M util/inteltool/ivy_memory.c M util/intelvbttool/intelvbttool.c M util/kconfig/conf.c M util/kconfig/confdata.c M util/kconfig/expr.c M util/kconfig/mconf.c M util/kconfig/nconf.h M util/marvell/doimage_mv/doimage.c M util/msrtool/darwin.c M util/msrtool/freebsd.c M util/msrtool/linux.c M util/msrtool/msrtool.c M util/nvramtool/common.h M util/pmh7tool/pmh7tool.c M util/post/post.c M util/sconfig/sconfig.h M util/smmstoretool/main.c M util/smmstoretool/utils.c M util/superiotool/Makefile M util/supermicro/smcbiosinfo/smcbiosinfo.c 44 files changed, 26 insertions(+), 55 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/85060/1
diff --git a/Makefile.mk b/Makefile.mk index ca79d05..a576049 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -507,7 +507,7 @@ CFLAGS_common += -pipe CFLAGS_common += -g CFLAGS_common += -nostdinc -CFLAGS_common += -std=gnu11 +CFLAGS_common += -std=gnu23 CFLAGS_common += -nostdlib CFLAGS_common += -Wall CFLAGS_common += -Wundef diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index afe38dc..8805a19 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -216,7 +216,7 @@ AR := $(AR_$(ARCH-y)) endif
-CFLAGS += -std=gnu11 $(CFLAGS_$(ARCH-y)) +CFLAGS += -std=gnu23 $(CFLAGS_$(ARCH-y))
ifneq ($(INNER_SCANBUILD),y) ifeq ($(CONFIG_LP_COMPILER_LLVM_CLANG),y) diff --git a/payloads/libpayload/curses/PDCurses/x11/pdcx11.c b/payloads/libpayload/curses/PDCurses/x11/pdcx11.c index 370cedb..e8b02e1 100644 --- a/payloads/libpayload/curses/PDCurses/x11/pdcx11.c +++ b/payloads/libpayload/curses/PDCurses/x11/pdcx11.c @@ -4,7 +4,6 @@
RCSID("$Id: pdcx11.c,v 1.96 2008/07/14 04:24:52 wmcbrine Exp $")
-#include <errno.h> #include <stdlib.h>
/*** Functions that are called by both processes ***/ @@ -73,6 +72,7 @@ int XC_read_socket(int sock_num, void *buf, int len) { int start = 0, length = len, rc; + errno_t err = 0;
PDC_LOG(("%s:XC_read_socket called: sock_num %d len %d\n", XCLOGMSG, sock_num, len)); @@ -84,9 +84,9 @@ #ifdef MOUSE_DEBUG if (sock_num == xc_key_sock) printf("%s:XC_read_socket(key) rc %d errno %d " - "resized: %d\n", XCLOGMSG, rc, errno, SP->resized); + "resized: %d\n", XCLOGMSG, rc, err, SP->resized); #endif - if (rc < 0 && sock_num == xc_key_sock && errno == EINTR + if (rc < 0 && sock_num == xc_key_sock && err == EINTR && SP->resized != FALSE) { MOUSE_LOG(("%s:continuing\n", XCLOGMSG)); diff --git a/payloads/libpayload/curses/curses.priv.h b/payloads/libpayload/curses/curses.priv.h index 31ec80f..a9afee3 100644 --- a/payloads/libpayload/curses/curses.priv.h +++ b/payloads/libpayload/curses/curses.priv.h @@ -80,12 +80,6 @@ //// #include <assert.h> #include <stdio.h>
-#include <errno.h> - -#if DECL_ERRNO -extern int errno; -#endif - //// #include <nc_panel.h> //// //// /* Some systems have a broken 'select()', but workable 'poll()'. Use that */ diff --git a/payloads/libpayload/curses/menu/mf_common.h b/payloads/libpayload/curses/menu/mf_common.h index d40c7b9..bdaed76 100644 --- a/payloads/libpayload/curses/menu/mf_common.h +++ b/payloads/libpayload/curses/menu/mf_common.h @@ -45,11 +45,6 @@ #include <assert.h> #include <string.h> #include <ctype.h> -#include <errno.h> - -#if DECL_ERRNO -extern int errno; -#endif
/* in case of debug version we ignore the suppression of assertions */ #ifdef TRACE diff --git a/payloads/libpayload/libc/string.c b/payloads/libpayload/libc/string.c index a1b7d4d..0a94b12 100644 --- a/payloads/libpayload/libc/string.c +++ b/payloads/libpayload/libc/string.c @@ -33,7 +33,7 @@ #include <ctype.h> #include <inttypes.h> #include <limits.h> -#include <errno.h> +#include <stdlib.h>
/** * Compare two strings. diff --git a/payloads/libpayload/tests/Makefile.mk b/payloads/libpayload/tests/Makefile.mk index a6cee5f..03125cc 100644 --- a/payloads/libpayload/tests/Makefile.mk +++ b/payloads/libpayload/tests/Makefile.mk @@ -48,7 +48,7 @@ TEST_CFLAGS += -Wstrict-aliasing -Wshadow -Werror TEST_CFLAGS += -Wno-unknown-warning-option -Wno-source-mgr -Wno-main-return-type
-TEST_CFLAGS += -std=gnu11 -ffunction-sections -fdata-sections -fno-builtin +TEST_CFLAGS += -std=gnu23 -ffunction-sections -fdata-sections -fno-builtin
ifneq ($(filter-out 0,$(DEBUG)),) TEST_CFLAGS += -Og -ggdb3 diff --git a/src/commonlib/bsd/include/commonlib/bsd/stdlib.h b/src/commonlib/bsd/include/commonlib/bsd/stdlib.h index c497b5c..38ecf7c 100644 --- a/src/commonlib/bsd/include/commonlib/bsd/stdlib.h +++ b/src/commonlib/bsd/include/commonlib/bsd/stdlib.h @@ -13,6 +13,16 @@ #define printk(level, ...) printf(__VA_ARGS__) #endif
+#ifndef __ERRNO_T_DEFINED +#define __ERRNO_T_DEFINED + +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L +#include <errno.h> +#else + typedef int errno_t; +#endif +#endif /* __ERRNO_T_DEFINED */ + void __noreturn abort(void); void free(void *ptr); void *malloc(size_t size); diff --git a/src/lib/libgcov.c b/src/lib/libgcov.c index 61304ff..74e00da 100644 --- a/src/lib/libgcov.c +++ b/src/lib/libgcov.c @@ -99,7 +99,6 @@ #include <string.h> #if GCOV_LOCKED #include <fcntl.h> -#include <errno.h> #include <sys/stat.h> #endif #else diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c index 7f17b71..9a10472 100644 --- a/util/amdfwtool/amdfwtool.c +++ b/util/amdfwtool/amdfwtool.c @@ -71,7 +71,6 @@
#include <commonlib/bsd/helpers.h> #include <fcntl.h> -#include <errno.h> #include <limits.h> #include <stdbool.h> #include <stdio.h> diff --git a/util/amdfwtool/handle_file.c b/util/amdfwtool/handle_file.c index c37bb2c..81ac4ce 100644 --- a/util/amdfwtool/handle_file.c +++ b/util/amdfwtool/handle_file.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <fcntl.h> -#include <errno.h> #include <limits.h> #include <stdio.h> #include <sys/stat.h> diff --git a/util/amdfwtool/signed_psp.c b/util/amdfwtool/signed_psp.c index 24f76e8..30b3c74 100644 --- a/util/amdfwtool/signed_psp.c +++ b/util/amdfwtool/signed_psp.c @@ -2,7 +2,6 @@
#include <assert.h> #include <fcntl.h> -#include <errno.h> #include <limits.h> #include <openssl/sha.h> #include <stdio.h> diff --git a/util/archive/archive.c b/util/archive/archive.c index f877632..3939a44 100644 --- a/util/archive/archive.c +++ b/util/archive/archive.c @@ -2,7 +2,6 @@
#include "archive.h" #include <endian.h> -#include <errno.h> #include <libgen.h> #include <stdint.h> #include <stdio.h> diff --git a/util/bucts/bucts.c b/util/bucts/bucts.c index 2bd1c5d..6c9a81f 100644 --- a/util/bucts/bucts.c +++ b/util/bucts/bucts.c @@ -8,7 +8,6 @@ #include <stdlib.h> #include <stdint.h> #include <string.h> -#include <errno.h> #include <unistd.h> #include <sys/mman.h> #if defined(__GLIBC__) diff --git a/util/cbfstool/Makefile.mk b/util/cbfstool/Makefile.mk index 8577874..b207523 100644 --- a/util/cbfstool/Makefile.mk +++ b/util/cbfstool/Makefile.mk @@ -140,10 +140,10 @@ TOOLCFLAGS += -mno-ms-bitfields endif ifeq ($(shell uname -o 2>/dev/null), Cygwin) -TOOLCFLAGS+=-std=gnu11 +TOOLCFLAGS+=-std=gnu23 TOOLCPPFLAGS+=-D_GNU_SOURCE else -TOOLCFLAGS+=-std=c11 +TOOLCFLAGS+=-std=c2x endif
LZ4CFLAGS ?= -Wno-strict-prototypes diff --git a/util/cbfstool/cse_fpt.c b/util/cbfstool/cse_fpt.c index 51fa9d0..525aba2 100644 --- a/util/cbfstool/cse_fpt.c +++ b/util/cbfstool/cse_fpt.c @@ -3,7 +3,6 @@
#include <commonlib/endian.h> #include <getopt.h> -#include <errno.h> #include <stdlib.h> #include <sys/stat.h> #include <sys/types.h> diff --git a/util/cbfstool/cse_serger.c b/util/cbfstool/cse_serger.c index 9d74a12..fe1528f 100644 --- a/util/cbfstool/cse_serger.c +++ b/util/cbfstool/cse_serger.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* CSE Serger - Tool for stitching Intel CSE components */
-#include <errno.h> #include <getopt.h> #include <stdlib.h> #include <sys/stat.h> diff --git a/util/cbfstool/flashmap/fmap.c b/util/cbfstool/flashmap/fmap.c index 46c31bb..052063b 100644 --- a/util/cbfstool/flashmap/fmap.c +++ b/util/cbfstool/flashmap/fmap.c @@ -9,7 +9,6 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/mman.h> -#include <errno.h> #include <inttypes.h> #include <limits.h> #include <assert.h> diff --git a/util/cbfstool/lz4/lib/Makefile b/util/cbfstool/lz4/lib/Makefile index ed59577..288c14e 100644 --- a/util/cbfstool/lz4/lib/Makefile +++ b/util/cbfstool/lz4/lib/Makefile @@ -20,7 +20,7 @@ PREFIX ?= /usr/local CPPFLAGS= -DXXH_NAMESPACE=LZ4_ CFLAGS ?= -O3 -CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wcast-qual -Wstrict-prototypes -pedantic +CFLAGS += -std=c2x -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wcast-qual -Wstrict-prototypes -pedantic FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
LIBDIR?= $(PREFIX)/lib diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index 15b6770..ac35f23 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -8,7 +8,6 @@ #include <unistd.h> #include <getopt.h> #include <dirent.h> -#include <errno.h> #include <fcntl.h> #include <ctype.h> #include <arpa/inet.h> diff --git a/util/intelmetool/mmap.c b/util/intelmetool/mmap.c index 988085e..d572edc 100644 --- a/util/intelmetool/mmap.c +++ b/util/intelmetool/mmap.c @@ -2,7 +2,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
#include "mmap.h" -#include <errno.h> +#include <stdlib.h> #include <string.h>
#ifndef __DARWIN__ diff --git a/util/intelmetool/msr.c b/util/intelmetool/msr.c index 1a5ead9..d9648e1 100644 --- a/util/intelmetool/msr.c +++ b/util/intelmetool/msr.c @@ -6,7 +6,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <errno.h>
#include "msr.h"
diff --git a/util/inteltool/cpu.c b/util/inteltool/cpu.c index ecd3eb4..cc65bd1 100644 --- a/util/inteltool/cpu.c +++ b/util/inteltool/cpu.c @@ -7,7 +7,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <errno.h> #include <limits.h>
#include "inteltool.h" diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index b7dbd62..c4f22d1 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -9,7 +9,6 @@ #include <fcntl.h> #include <sys/mman.h> #include <unistd.h> -#include <errno.h> #include <limits.h> #include "inteltool.h" #include "pcr.h" diff --git a/util/inteltool/ivy_memory.c b/util/inteltool/ivy_memory.c index 15d3a10..8be914d 100644 --- a/util/inteltool/ivy_memory.c +++ b/util/inteltool/ivy_memory.c @@ -4,7 +4,7 @@ #include <stdlib.h> #include <string.h> #include <inttypes.h> -#include <errno.h> + #include "inteltool.h"
extern volatile uint8_t *mchbar; diff --git a/util/intelvbttool/intelvbttool.c b/util/intelvbttool/intelvbttool.c index a70b33c..910dd16 100644 --- a/util/intelvbttool/intelvbttool.c +++ b/util/intelvbttool/intelvbttool.c @@ -10,7 +10,6 @@ #include <sys/stat.h> #include <fcntl.h> #include <getopt.h> -#include <errno.h> #include <stdarg.h> #include <commonlib/helpers.h>
diff --git a/util/kconfig/conf.c b/util/kconfig/conf.c index 8499143..23a87f9 100644 --- a/util/kconfig/conf.c +++ b/util/kconfig/conf.c @@ -12,7 +12,6 @@ #include <unistd.h> #include <getopt.h> #include <sys/time.h> -#include <errno.h>
#include "lkc.h"
diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c index 0105917..1aa3b3d 100644 --- a/util/kconfig/confdata.c +++ b/util/kconfig/confdata.c @@ -7,7 +7,6 @@ #include <sys/stat.h> #include <sys/types.h> #include <ctype.h> -#include <errno.h> #include <fcntl.h> #include <limits.h> #include <stdarg.h> diff --git a/util/kconfig/expr.c b/util/kconfig/expr.c index 22bc337..d3bf040 100644 --- a/util/kconfig/expr.c +++ b/util/kconfig/expr.c @@ -4,7 +4,6 @@ */
#include <ctype.h> -#include <errno.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/util/kconfig/mconf.c b/util/kconfig/mconf.c index d921223..ba12d70 100644 --- a/util/kconfig/mconf.c +++ b/util/kconfig/mconf.c @@ -9,7 +9,6 @@ */
#include <ctype.h> -#include <errno.h> #include <fcntl.h> #include <limits.h> #include <stdarg.h> diff --git a/util/kconfig/nconf.h b/util/kconfig/nconf.h index 174b035..2408b2e 100644 --- a/util/kconfig/nconf.h +++ b/util/kconfig/nconf.h @@ -6,7 +6,6 @@ */
#include <ctype.h> -#include <errno.h> #include <fcntl.h> #include <limits.h> #include <stdarg.h> diff --git a/util/marvell/doimage_mv/doimage.c b/util/marvell/doimage_mv/doimage.c index 5ead1f8..28b8bb2 100644 --- a/util/marvell/doimage_mv/doimage.c +++ b/util/marvell/doimage_mv/doimage.c @@ -15,7 +15,6 @@ disclaimer.
*******************************************************************************/ -#include <errno.h> #include <fcntl.h> #include <stdio.h> #include <stdlib.h> diff --git a/util/msrtool/darwin.c b/util/msrtool/darwin.c index 051ef3b..6867405 100644 --- a/util/msrtool/darwin.c +++ b/util/msrtool/darwin.c @@ -5,7 +5,7 @@ #include <fcntl.h> #include <unistd.h> #include <string.h> -#include <errno.h> +#include <stdlib.h>
#include "msrtool.h"
diff --git a/util/msrtool/freebsd.c b/util/msrtool/freebsd.c index f1afc9a..0cfc351 100644 --- a/util/msrtool/freebsd.c +++ b/util/msrtool/freebsd.c @@ -5,7 +5,7 @@ #include <fcntl.h> #include <unistd.h> #include <string.h> -#include <errno.h> +#include <stdlib.h>
#include "msrtool.h"
diff --git a/util/msrtool/linux.c b/util/msrtool/linux.c index b2b7bdd..5a800a9 100644 --- a/util/msrtool/linux.c +++ b/util/msrtool/linux.c @@ -5,7 +5,7 @@ #include <fcntl.h> #include <unistd.h> #include <string.h> -#include <errno.h> +#include <stdlib.h>
#include "msrtool.h"
diff --git a/util/msrtool/msrtool.c b/util/msrtool/msrtool.c index 02c641f..4005264 100644 --- a/util/msrtool/msrtool.c +++ b/util/msrtool/msrtool.c @@ -7,7 +7,6 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <errno.h> #include <pci/pci.h>
#include "msrtool.h" diff --git a/util/nvramtool/common.h b/util/nvramtool/common.h index e15138c..3f1440c 100644 --- a/util/nvramtool/common.h +++ b/util/nvramtool/common.h @@ -6,7 +6,6 @@ #include <sys/types.h> #include <sys/stat.h> #include <assert.h> -#include <errno.h> #include <unistd.h> #include <fcntl.h> #include <stdint.h> diff --git a/util/pmh7tool/pmh7tool.c b/util/pmh7tool/pmh7tool.c index 346edae..1d2be00 100644 --- a/util/pmh7tool/pmh7tool.c +++ b/util/pmh7tool/pmh7tool.c @@ -4,7 +4,6 @@ #include <stdlib.h> #include <getopt.h> #include <sys/io.h> -#include <errno.h> #include <string.h> #include <unistd.h> #include <stdint.h> diff --git a/util/post/post.c b/util/post/post.c index 8578d04..fdc9e37 100644 --- a/util/post/post.c +++ b/util/post/post.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */
-#include <errno.h> #include <limits.h> #include <stdarg.h> #include <stdio.h> diff --git a/util/sconfig/sconfig.h b/util/sconfig/sconfig.h index 5fc8b4f..c220fc0 100644 --- a/util/sconfig/sconfig.h +++ b/util/sconfig/sconfig.h @@ -7,7 +7,6 @@ #include <string.h> #include <sys/types.h> #include <unistd.h> -#include <errno.h> #include <stdbool.h>
struct resource; diff --git a/util/smmstoretool/main.c b/util/smmstoretool/main.c index 89d58d6..bdccdae 100644 --- a/util/smmstoretool/main.c +++ b/util/smmstoretool/main.c @@ -2,7 +2,6 @@
#include <unistd.h>
-#include <errno.h> #include <stdbool.h> #include <stdint.h> #include <stdio.h> diff --git a/util/smmstoretool/utils.c b/util/smmstoretool/utils.c index 9f554e0..2bf4c6e 100644 --- a/util/smmstoretool/utils.c +++ b/util/smmstoretool/utils.c @@ -7,7 +7,6 @@ #include <fcntl.h> #include <unistd.h>
-#include <errno.h> #include <limits.h> #include <stdbool.h> #include <stddef.h> diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile index 39839d9..2420c81 100644 --- a/util/superiotool/Makefile +++ b/util/superiotool/Makefile @@ -12,7 +12,7 @@ VERSION := -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"'
CFLAGS += -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \ - -Werror-implicit-function-declaration -std=c11 -pedantic $(VERSION) \ + -Werror-implicit-function-declaration -std=c2x -pedantic $(VERSION) \ -Wno-variadic-macros -I $(TOP)/src/commonlib/bsd/include LDFLAGS += -lz
diff --git a/util/supermicro/smcbiosinfo/smcbiosinfo.c b/util/supermicro/smcbiosinfo/smcbiosinfo.c index 6a27ba7..96674dd 100644 --- a/util/supermicro/smcbiosinfo/smcbiosinfo.c +++ b/util/supermicro/smcbiosinfo/smcbiosinfo.c @@ -8,7 +8,6 @@ #include <sys/types.h> #include <sys/stat.h> #include <getopt.h> -#include <errno.h> #include <stdarg.h>
/* Place the following struct somewhere in the ROM: */