diff options
| author | Julius Werner <jwerner@chromium.org> | 2020-11-18 16:31:27 -0800 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2020-11-20 01:51:08 +0000 |
| commit | 9d4053df76c127f625a8571d3ef16e6a063c8de5 (patch) | |
| tree | c266dd5dd83a6b64fee9f31012b396539b1f6a6b /futility | |
| parent | abcd6d24548480c1b3aeb5998c15b8548cea3b76 (diff) | |
| download | vboot-9d4053df76c127f625a8571d3ef16e6a063c8de5.tar.gz | |
Revert "Reland: Clean up implicit fall through."stabilize-rust-13613.B
This reverts commit 6208b9aa9c4e8b7c9ff8063965c9f9aa519c1740.
Upstream coreboot has raised concerns that relying on GCC 7+ features
for host utilities is too restrictive, so revert this and go back to
customizing fallthrough annotations by compiler. Cleaned out some of the
C++-specific stuff because vboot isn't built with C++.
BRANCH=None
BUG=None
TEST=Built with clang and GCC.
Change-Id: I75d796d289b0a6c249fc8ac2dadb1453be468642
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2547821
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'futility')
| -rw-r--r-- | futility/cmd_dump_fmap.c | 4 | ||||
| -rw-r--r-- | futility/cmd_sign.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/futility/cmd_dump_fmap.c b/futility/cmd_dump_fmap.c index ff7252c6..3a0e14ed 100644 --- a/futility/cmd_dump_fmap.c +++ b/futility/cmd_dump_fmap.c @@ -445,7 +445,7 @@ static int do_dump_fmap(int argc, char *argv[]) break; case 'H': opt_gaps = 1; - __attribute__ ((fallthrough)); + VBOOT_FALLTHROUGH; case 'h': opt_format = FMT_HUMAN; opt_overlap++; @@ -508,7 +508,7 @@ static int do_dump_fmap(int argc, char *argv[]) case FMT_NORMAL: printf("hit at 0x%08x\n", (uint32_t) ((char *)fmap - (char *)base_of_rom)); - __attribute__ ((fallthrough)); + VBOOT_FALLTHROUGH; default: retval = normal_fmap(fmap, argc - optind - 1, diff --git a/futility/cmd_sign.c b/futility/cmd_sign.c index c95b8c97..6243e3a8 100644 --- a/futility/cmd_sign.c +++ b/futility/cmd_sign.c @@ -722,7 +722,7 @@ static int do_sign(int argc, char *argv[]) break; case OPT_FV: sign_option.fv_specified = 1; - __attribute__ ((fallthrough)); + VBOOT_FALLTHROUGH; case OPT_INFILE: sign_option.inout_file_count++; infile = optarg; |