| From 0530c150de6acd429c0b1ab2ef9842eee7c213ea Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 4 Oct 2023 17:08:18 -0700 |
| Subject: objtool: Propagate early errors |
| |
| From: Aaron Plattner <aplattner@nvidia.com> |
| |
| [ Upstream commit e959c279d391c10b35ce300fb4b0fe3b98e86bd2 ] |
| |
| If objtool runs into a problem that causes it to exit early, the overall |
| tool still returns a status code of 0, which causes the build to |
| continue as if nothing went wrong. |
| |
| Note this only affects early errors, as later errors are still ignored |
| by check(). |
| |
| Fixes: b51277eb9775 ("objtool: Ditch subcommands") |
| Signed-off-by: Aaron Plattner <aplattner@nvidia.com> |
| Link: https://lore.kernel.org/r/cb6a28832d24b2ebfafd26da9abb95f874c83045.1696355111.git.aplattner@nvidia.com |
| Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/objtool/objtool.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| diff --git a/tools/objtool/objtool.c b/tools/objtool/objtool.c |
| index a7ecc32e35125..cda649644e32d 100644 |
| --- a/tools/objtool/objtool.c |
| +++ b/tools/objtool/objtool.c |
| @@ -146,7 +146,5 @@ int main(int argc, const char **argv) |
| exec_cmd_init("objtool", UNUSED, UNUSED, UNUSED); |
| pager_init(UNUSED); |
| |
| - objtool_run(argc, argv); |
| - |
| - return 0; |
| + return objtool_run(argc, argv); |
| } |
| -- |
| 2.42.0 |
| |
