From f8e37efbcf4d66f92d0ca15e9a20abaa324354cd Mon Sep 17 00:00:00 2001 From: Mathias Krause Date: Tue, 7 Feb 2017 19:03:29 +0100 Subject: [PATCH] UPSTREAM: libpayload: x86/main - propagate return value of main() According to coreboots payload API [1], the called payload should be able to return a value via %eax. Support this by changing the prototype of start_main() and pass on the return value of main() to the caller instead of discarding it. [1] https://www.coreboot.org/Payload_API BUG=none BRANCH=none TEST=none Change-Id: I1782c45b615d431de8be5a533d5890ed53ddb9d8 Signed-off-by: Furquan Shaikh Original-Commit-Id: 7b681c5926d3699b33c936e34a8176833a03eaf2 Original-Change-Id: I8442faea19cc8e04487092f8e61aa4e5cba3ba76 Original-Signed-off-by: Mathias Krause Original-Reviewed-on: https://review.coreboot.org/18334 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Paul Menzel Original-Reviewed-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/444815 --- payloads/libpayload/arch/x86/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/payloads/libpayload/arch/x86/main.c b/payloads/libpayload/arch/x86/main.c index fbd4dc4e18..f9a5e2cf83 100644 --- a/payloads/libpayload/arch/x86/main.c +++ b/payloads/libpayload/arch/x86/main.c @@ -42,8 +42,8 @@ char *main_argv[MAX_ARGC_COUNT]; * This is our C entry function - set up the system * and jump into the payload entry point. */ -void start_main(void); -void start_main(void) +int start_main(void); +int start_main(void) { extern int main(int argc, char **argv); @@ -67,10 +67,9 @@ void start_main(void) * In the future we may care about the return value. */ - (void) main(main_argc, (main_argc != 0) ? main_argv : NULL); - /* - * Returning here will go to the _leave function to return + * Returning from main() will go to the _leave function to return * us to the original context. */ + return main(main_argc, (main_argc != 0) ? main_argv : NULL); }