diff mbox series

[1/1] common: always compile fixup_cmdtable()

Message ID 20201126194637.59863-1-xypron.glpk@gmx.de
State Accepted
Commit 7cf5b4053b433ae0dbb0462e58fd426b43fc69fd
Delegated to: Tom Rini
Headers show
Series [1/1] common: always compile fixup_cmdtable() | expand

Commit Message

Heinrich Schuchardt Nov. 26, 2020, 7:46 p.m. UTC
With our optimization settings the linker eliminates unused functions.

But for debugging it is better to compile with -Og or -O0. With -O0
compiling the sandbox fails due to the missing function fixup_cmdtable()
called by dm_reloc() and others.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
 common/command.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--
2.29.2

Comments

Simon Glass Nov. 30, 2020, 8:12 p.m. UTC | #1
On Thu, 26 Nov 2020 at 12:46, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
>
> With our optimization settings the linker eliminates unused functions.
>
> But for debugging it is better to compile with -Og or -O0. With -O0
> compiling the sandbox fails due to the missing function fixup_cmdtable()
> called by dm_reloc() and others.
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
>  common/command.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>
Tom Rini Jan. 18, 2021, 1:01 p.m. UTC | #2
On Thu, Nov 26, 2020 at 08:46:37PM +0100, Heinrich Schuchardt wrote:

> With our optimization settings the linker eliminates unused functions.
> 
> But for debugging it is better to compile with -Og or -O0. With -O0
> compiling the sandbox fails due to the missing function fixup_cmdtable()
> called by dm_reloc() and others.
> 
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/common/command.c b/common/command.c
index 2c491e20a7..345846f165 100644
--- a/common/command.c
+++ b/common/command.c
@@ -16,6 +16,8 @@ 
 #include <log.h>
 #include <linux/ctype.h>

+DECLARE_GLOBAL_DATA_PTR;
+
 /*
  * Use puts() instead of printf() to avoid printf buffer overflow
  * for long help messages
@@ -488,9 +490,6 @@  int cmd_get_data_size(char* arg, int default_size)
 }
 #endif

-#if defined(CONFIG_NEEDS_MANUAL_RELOC)
-DECLARE_GLOBAL_DATA_PTR;
-
 void fixup_cmdtable(struct cmd_tbl *cmdtp, int size)
 {
 	int	i;
@@ -535,7 +534,6 @@  void fixup_cmdtable(struct cmd_tbl *cmdtp, int size)
 		cmdtp++;
 	}
 }
-#endif

 int cmd_always_repeatable(struct cmd_tbl *cmdtp, int flag, int argc,
 			  char *const argv[], int *repeatable)