OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ld: In map file use '=' in PROVIDE statements 

Currently when recording a PROVIDE statement in a linker map file we
display something like:

    PROVIDE (SYMBOL, VALUE)

However, in a linker script we write these statements like this:

    PROVIDE (SYMBOL = VALUE);

This commit changes the output in the map file to be closer to linker
script format, the map file now contains:

    PROVIDE (SYMBOL = VALUE)

The ';' is still missing from the end, but map files are not intended
to be valid linker script input, so adding the ';' just seems like
clutter.

ld/ChangeLog:

	* ldexp.c (exp_print_tree): Use '=' instead of ',' when printing
	PROVIDE statements.
	* testsuite/ld-scripts/provide-4.map: Update expected output.
	* testsuite/ld-scripts/provide-5.map: Likewise.
This commit is contained in:
Andrew Burgess 2018-01-05 22:41:55 +00:00
parent 6bd0a312a4
commit b3b9f8d3e9
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ld/ChangeLog
View File

@ -1,3 +1,10 @@
2018-01-11 Andrew Burgess <andrew.burgess@embecosm.com>
* ldexp.c (exp_print_tree): Use '=' instead of ',' when printing
PROVIDE statements.
* testsuite/ld-scripts/provide-4.map: Update expected output.
* testsuite/ld-scripts/provide-5.map: Likewise.
2018-01-11 H.J. Lu <hongjiu.lu@intel.com>
PR ld/22696

2
ld/ldexp.c
View File

@ -1423,7 +1423,7 @@ exp_print_tree (etree_type *tree)
break;
case etree_provide:
case etree_provided:
fprintf (config.map_file, "PROVIDE (%s, ", tree->assign.dst);
fprintf (config.map_file, "PROVIDE (%s = ", tree->assign.dst);
exp_print_tree (tree->assign.src);
fputc (')', config.map_file);
break;

12
ld/testsuite/ld-scripts/provide-4-map.d
View File

@ -1,13 +1,13 @@
#...
Linker script and memory map
#...
\[!provide\] +PROVIDE \(foo, 0x1\)
\[!provide\] +PROVIDE \(bar, 0x2\)
0x0+3 +PROVIDE \(baz, 0x3\)
\[!provide\] +PROVIDE \(foo = 0x1\)
\[!provide\] +PROVIDE \(bar = 0x2\)
0x0+3 +PROVIDE \(baz = 0x3\)
#...
0x0+2000 +foo
\[!provide\] +PROVIDE \(loc1, ALIGN \(\., 0x10\)\)
0x0+2010 +PROVIDE \(loc2, ALIGN \(\., 0x10\)\)
\[!provide\] +PROVIDE \(loc3, \(loc1 \+ 0x20\)\)
\[!provide\] +PROVIDE \(loc1 = ALIGN \(\., 0x10\)\)
0x0+2010 +PROVIDE \(loc2 = ALIGN \(\., 0x10\)\)
\[!provide\] +PROVIDE \(loc3 = \(loc1 \+ 0x20\)\)
0x0+2030 +loc4 = \(loc2 \+ 0x20\)
#...

2
ld/testsuite/ld-scripts/provide-5-map.d
View File

@ -2,5 +2,5 @@
Linker script and memory map
#...
0x0+10 +foo = 0x10
\[!provide\] +PROVIDE \(foo, bar\)
\[!provide\] +PROVIDE \(foo = bar\)
#...