HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33823
Change subject: Get rid of PRIu64 ......................................................................
Get rid of PRIu64
Change-Id: I9e3a300f9b1c38e4831b030ff8af3fed2fa60f14 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/arch/arm/include/stdint.h M src/arch/arm64/include/stdint.h M src/arch/riscv/include/stdint.h M src/arch/x86/include/stdint.h M src/lib/timestamp.c M util/cbfstool/rmodule.c 6 files changed, 2 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/23/33823/1
diff --git a/src/arch/arm/include/stdint.h b/src/arch/arm/include/stdint.h index ede0ec9..ae5ff22 100644 --- a/src/arch/arm/include/stdint.h +++ b/src/arch/arm/include/stdint.h @@ -101,9 +101,6 @@ #ifndef UINT64_C #define UINT64_C(c) c ## ULL #endif -#ifndef PRIu64 -#define PRIu64 "llu" -#endif
#undef __HAVE_LONG_LONG__
diff --git a/src/arch/arm64/include/stdint.h b/src/arch/arm64/include/stdint.h index cb07a07..e40a9f5 100644 --- a/src/arch/arm64/include/stdint.h +++ b/src/arch/arm64/include/stdint.h @@ -79,8 +79,5 @@ #ifndef UINT64_MAX # define UINT64_MAX (18446744073709551615ULL) #endif -#ifndef PRIu64 -#define PRIu64 "llu" -#endif
#endif /* ARM64_STDINT_H */ diff --git a/src/arch/riscv/include/stdint.h b/src/arch/riscv/include/stdint.h index 76f0d1b..eaaba18 100644 --- a/src/arch/riscv/include/stdint.h +++ b/src/arch/riscv/include/stdint.h @@ -73,7 +73,4 @@ typedef long intptr_t; typedef unsigned long uintptr_t;
-/* FIXME: This is used in some print code and may be removed in the future. */ -#define PRIu64 "llu" - #endif /* RISCV_STDINT_H */ diff --git a/src/arch/x86/include/stdint.h b/src/arch/x86/include/stdint.h index 6c40002..262c6a3 100644 --- a/src/arch/x86/include/stdint.h +++ b/src/arch/x86/include/stdint.h @@ -102,11 +102,6 @@ #ifndef UINT64_C #define UINT64_C(c) c ## ULL #endif -#ifndef PRIu64 -#define PRIu64 "llu" - -#endif -
#undef __HAVE_LONG_LONG__
diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c index adacf6b..347e937 100644 --- a/src/lib/timestamp.c +++ b/src/lib/timestamp.c @@ -180,7 +180,7 @@ tse->entry_stamp = ts_time - ts_table->base_time;
if (CONFIG(TIMESTAMPS_ON_CONSOLE)) - printk(BIOS_SPEW, "Timestamp - %s: %" PRIu64 "\n", + printk(BIOS_SPEW, "Timestamp - %s: %llu\n", timestamp_name(id), ts_time);
if (ts_table->num_entries == ts_table->max_entries) diff --git a/util/cbfstool/rmodule.c b/util/cbfstool/rmodule.c index 80e8911..c1fcd13 100644 --- a/util/cbfstool/rmodule.c +++ b/util/cbfstool/rmodule.c @@ -328,7 +328,7 @@ return -1;
nrelocs = ctx->nrelocs; - INFO("%" PRIu64 " relocations to be emitted.\n", nrelocs); + INFO("%llu relocations to be emitted.\n", nrelocs); if (!nrelocs) return 0;