diff options
| author | Mathew King <mathewk@chromium.org> | 2019-11-05 22:21:33 +0000 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2019-11-05 22:45:39 +0000 |
| commit | ed8390ec50b2decdf18a3416d07d37222cb0130d (patch) | |
| tree | ae4392e8113ae1c0950c186979754082737a44de /futility | |
| parent | 6a703f5b0edfdbf2eee72d59499f73585262a46f (diff) | |
| download | vboot-ed8390ec50b2decdf18a3416d07d37222cb0130d.tar.gz | |
Revert "Clean up implicit fall through."
This reverts commit 6a703f5b0edfdbf2eee72d59499f73585262a46f.
Reason for revert: This change breaks building coreboot
Original change's description:
> Clean up implicit fall through.
>
> Directly use the __attribute__ ((fallthrough)) instead of
> a macro.
> This was suggested in CL:1772474.
>
> BUG=chromium:997709
> TEST=CQ
> BRANCH=None
>
> Change-Id: Ic6cd417d7c735395a4b136dbb0879a6f1716da98
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1897360
> Tested-by: Manoj Gupta <manojgupta@chromium.org>
> Reviewed-by: Julius Werner <jwerner@chromium.org>
> Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Bug: chromium:997709
Change-Id: Icd0de8bcdee44d1b41f313a4f5aaba8108f734ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1899735
Reviewed-by: Mathew King <mathewk@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Julius Werner <jwerner@chromium.org>
Tested-by: Julius Werner <jwerner@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 48f9185c..ef46ffcd 100644 --- a/futility/cmd_dump_fmap.c +++ b/futility/cmd_dump_fmap.c @@ -444,7 +444,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++; @@ -507,7 +507,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 9bfba4f8..fb096763 100644 --- a/futility/cmd_sign.c +++ b/futility/cmd_sign.c @@ -721,7 +721,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; |