Patchwork [U-Boot] helper: Add architecture specific symbol prefix in the uboot list link script.

login
register
mail settings
Submitter Sonic Zhang
Date Feb. 6, 2013, 9:21 a.m.
Message ID <1360142463-5035-1-git-send-email-sonic.adi@gmail.com>
Download mbox | patch
Permalink /patch/218508/
State Rejected
Delegated to: Wolfgang Denk
Headers show

Comments

Sonic Zhang - Feb. 6, 2013, 9:21 a.m.
From: Sonic Zhang <sonic.zhang@analog.com>

Blackfin compiler add prefix '_' to each symbols. All symbols defined in the
link script should have this prefix. Add it to the uboot list helper function
make_u_boot_list.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
---
 helper.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Albert ARIBAUD - Feb. 6, 2013, 1:36 p.m.
Hi Sonic,

On Wed, 6 Feb 2013 17:21:03 +0800, Sonic Zhang <sonic.adi@gmail.com>
wrote:

> From: Sonic Zhang <sonic.zhang@analog.com>
> 
> Blackfin compiler add prefix '_' to each symbols. All symbols defined in the
> link script should have this prefix. Add it to the uboot list helper function
> make_u_boot_list.
> 
> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
> ---
>  helper.mk |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/helper.mk b/helper.mk
> index 79a1da0..16e4cfd 100644
> --- a/helper.mk
> +++ b/helper.mk
> @@ -58,7 +58,7 @@ $(1): $(2)
>  		-e ':s /^.\+$$$$/ { p;s/^\(.*\)\.[^\.]*$$$$/\1/;b s }' | \
>  	sed -n -e 'h;s/$$$$/\a/p;g;s/$$$$/@/p;g;s/$$$$/~/p;' | \
>  	LC_COLLATE=C sort -u | \
> -	sed -n -e '/\a$$$$/ { s/\./_/g;s/\a$$$$/__start = .;/p; }'\
> -		-e '/~$$$$/ { s/\./_/g;s/~$$$$/__end = .;/p; }'\
> +	sed -n -e '/\a$$$$/ { s/\./_/g;s/\_u_boot_list/$(SYM_PREFIX)_u_boot_list/g;s/\a$$$$/__start = .;/p; }'\
> +		-e '/~$$$$/ { s/\./_/g;s/\_u_boot_list/$(SYM_PREFIX)_u_boot_list/g;s/~$$$$/__end = .;/p; }'\
>  		-e '/@$$$$/ { s/\(.*\)@$$$$/*(SORT(\1.*));/p }' > $(1)
>  endef

The patch I submitted to fix relocation of linker lists [1] removes file
helper.mk. There is thus no need to change it.

[1] http://patchwork.ozlabs.org/patch/217695/

Amicalement,
Wolfgang Denk - Feb. 6, 2013, 11:15 p.m.
Dear Sonic Zhang,

In message <1360142463-5035-1-git-send-email-sonic.adi@gmail.com> you wrote:
> From: Sonic Zhang <sonic.zhang@analog.com>
> 
> Blackfin compiler add prefix '_' to each symbols. All symbols defined in the
> link script should have this prefix. Add it to the uboot list helper function
> make_u_boot_list.
> 
> Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>

Maybe the BF compiler does so - but this script is used by all
architectures: did you verify that this change is actually working on
those?


Best regards,

Wolfgang Denk

--
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
"Nobody will ever need more than 640k RAM!"       -- Bill Gates, 1981
"Windows 95 needs at least 8 MB RAM."             -- Bill Gates, 1996
"Nobody will ever need Windows 95."             -- logical conclusion

Patch

diff --git a/helper.mk b/helper.mk
index 79a1da0..16e4cfd 100644
--- a/helper.mk
+++ b/helper.mk
@@ -58,7 +58,7 @@  $(1): $(2)
 		-e ':s /^.\+$$$$/ { p;s/^\(.*\)\.[^\.]*$$$$/\1/;b s }' | \
 	sed -n -e 'h;s/$$$$/\a/p;g;s/$$$$/@/p;g;s/$$$$/~/p;' | \
 	LC_COLLATE=C sort -u | \
-	sed -n -e '/\a$$$$/ { s/\./_/g;s/\a$$$$/__start = .;/p; }'\
-		-e '/~$$$$/ { s/\./_/g;s/~$$$$/__end = .;/p; }'\
+	sed -n -e '/\a$$$$/ { s/\./_/g;s/\_u_boot_list/$(SYM_PREFIX)_u_boot_list/g;s/\a$$$$/__start = .;/p; }'\
+		-e '/~$$$$/ { s/\./_/g;s/\_u_boot_list/$(SYM_PREFIX)_u_boot_list/g;s/~$$$$/__end = .;/p; }'\
 		-e '/@$$$$/ { s/\(.*\)@$$$$/*(SORT(\1.*));/p }' > $(1)
 endef