Skip to content

Commit

Permalink
CHROMIUM: Add #line to fatal.c, shell.c
Browse files Browse the repository at this point in the history
Work around coreboot GCC preprocessor bug.

BUG=b:272518464
TEST=BOARD=screebo ; zmake build -c $BOARD &&
./util/find_non_exec_lines.py build/zephyr/$BOARD/output/zephyr.info

Change-Id: I879408d2b1c4d5c1227b5ce812bc73be61ae6738
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5595811
Reviewed-by: Tristan Honscheid <honscheid@google.com>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
  • Loading branch information
jeremybettis authored and Chromeos LUCI committed Jun 4, 2024
1 parent 139887b commit b73961e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
6 changes: 6 additions & 0 deletions kernel/fatal.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
* SPDX-License-Identifier: Apache-2.0
*/

/*
* TODO(b/272518464): Work around coreboot GCC preprocessor bug.
* #line marks the *next* line, so it is off by one.
*/
#line 12

#include <zephyr/kernel.h>

#include <kernel_internal.h>
Expand Down
6 changes: 6 additions & 0 deletions subsys/shell/shell.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
* SPDX-License-Identifier: Apache-2.0
*/

/*
* TODO(b/272518464): Work around coreboot GCC preprocessor bug.
* #line marks the *next* line, so it is off by one.
*/
#line 12

#include <ctype.h>
#include <stdlib.h>
#include <zephyr/sys/atomic.h>
Expand Down

0 comments on commit b73961e

Please sign in to comment.