2008-08-07 04:55:51

by Yoshinori Sato

[permalink] [raw]
Subject: [PATCH] kallsyms exclude local symbols

h8300's nm output include '.Lfoo' local symbols.

This is head of System.map
00000000 T __vector
00000100 T _interrupt_redirect_table
00000100 T _text
00000200 T __start
00000200 T __stext
0000024c t _exit
00000252 T __platform_gpio_table
0000025a t gpio_table
00000270 t .LFB1596
00000270 t .LM1
00000270 t .LM2
00000270 t .Ltext0
00000270 t _run_init_process
0000027a t .LM3
00000286 t .LFB1597
00000286 t .LFE1596
00000286 t .LM4
00000286 t .LM5
00000286 t _init_post
0000028a t .LM6
00000296 t .LM7
000002aa t .LM8
000002ba t .L199
000002ba t .LM9
000002c0 t .LM10

exclude local symbol patch.

Signed-off-by: Yoshinori Sato <[email protected]>
---
scripts/kallsyms.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index ad2434b..a1652da 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -106,7 +106,7 @@ static int read_symbol(FILE *in, struct sym_entry *s)
is_arm_mapping_symbol(sym))
return -1;
/* exclude also MIPS ELF local symbols ($L123 instead of .L123) */
- else if (str[0] == '$')
+ else if (str[0] == '$' || str[0] == '.')
return -1;
/* exclude debugging symbols */
else if (stype == 'N')
--
1.5.6.3

--
Yoshinori Sato
<[email protected]>


2008-08-07 12:55:36

by Paulo Marques

[permalink] [raw]
Subject: Re: [PATCH] kallsyms exclude local symbols

Yoshinori Sato wrote:
> h8300's nm output include '.Lfoo' local symbols.
> [...]
> /* exclude also MIPS ELF local symbols ($L123 instead of .L123) */
> - else if (str[0] == '$')
> + else if (str[0] == '$' || str[0] == '.')

The comment above needs some updating too. Something along these lines:

/* exclude also MIPS ELF local symbols (eg. $L123) and h8300 (eg .LM10) */

Other than that, the patch seems fine.

--
Paulo Marques - http://www.grupopie.com

"...so she told me it was either her or the ham radio, over."

2008-08-07 23:36:28

by Yoshinori Sato

[permalink] [raw]
Subject: [PATCH] exclude h8300 local symbols (Re: kallsyms exclude local symbols)

At Thu, 07 Aug 2008 13:00:05 +0100,
Paulo Marques wrote:
>
> Yoshinori Sato wrote:
> > h8300's nm output include '.Lfoo' local symbols.
> > [...]
> > /* exclude also MIPS ELF local symbols ($L123 instead of .L123) */
> > - else if (str[0] == '$')
> > + else if (str[0] == '$' || str[0] == '.')
>
> The comment above needs some updating too. Something along these lines:
>
> /* exclude also MIPS ELF local symbols (eg. $L123) and h8300 (eg .LM10) */
>
> Other than that, the patch seems fine.
>
> --
> Paulo Marques - http://www.grupopie.com
>
> "...so she told me it was either her or the ham radio, over."

Thanks reply.

Update comment.
And same problem in modpost.

Warning message dirty.
WARNING: vmlinux.o(.text+0x304b): Section mismatch in reference from the variable .LM10 to the variable .init.text:_free_area_init
The function .LM10() references
the variable __init _free_area_init.
This is often because .LM10 lacks a __init
annotation or the annotation of _free_area_init is wrong.

fix it.
WARNING: vmlinux.o(.text+0x304b): Section mismatch in reference from the variable _paging_init to the variable .init.text:___alloc_bootmem
The function _paging_init() references
the variable __init ___alloc_bootmem.
This is often because _paging_init lacks a __init
annotation or the annotation of ___alloc_bootmem is wrong.

Signed-off-by: Yoshinori Sato <[email protected]>

---
scripts/kallsyms.c | 5 +++--
scripts/mod/modpost.c | 4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index ad2434b..64ad9cf 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -105,8 +105,9 @@ static int read_symbol(FILE *in, struct sym_entry *s)
else if (toupper(stype) == 'U' ||
is_arm_mapping_symbol(sym))
return -1;
- /* exclude also MIPS ELF local symbols ($L123 instead of .L123) */
- else if (str[0] == '$')
+ /* exclude also MIPS ELF (e.g. $L123) and h8300 elf (e.g. .LM123)
+ local symbols */
+ else if (str[0] == '$' || str[0] == '.')
return -1;
/* exclude debugging symbols */
else if (stype == 'N')
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 418cd7d..e07f4ba 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1042,7 +1042,9 @@ static inline int is_valid_name(struct elf_info *elf, Elf_Sym *sym)
{
const char *name = elf->strtab + sym->st_name;

- if (!name || !strlen(name))
+ if (!name || !strlen(name) ||
+ /* exclude h8300 elf local symbols (e.g. .LM123) */
+ name[0] == '.')
return 0;
return !is_arm_mapping_symbol(name);
}
--
1.5.6.3

--
Yoshinori Sato
<[email protected]>