diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 18 | ||||
| -rw-r--r-- | ld/NEWS | 2 | ||||
| -rw-r--r-- | ld/ld.texi | 22 | ||||
| -rw-r--r-- | ld/ldmain.c | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-scripts/rgn-over1.d | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-scripts/rgn-over2.d | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-scripts/rgn-over3.d | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-scripts/rgn-over4.d | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-scripts/rgn-over5.d | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-scripts/rgn-over6.d | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-scripts/rgn-over7.d | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/property-x86-ibt1a-x32.d | 3 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/property-x86-ibt1a.d | 3 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/property-x86-ibt1a.map | 3 |
14 files changed, 57 insertions, 2 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 5138225..c8c48c5 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,21 @@ +2018-12-07 H.J. Lu <hongjiu.lu@intel.com> + + * NEWS: Updated for property change report. + * ld.texi: Document property change report. + * ldmain.c (main): Set link_info.has_map_file to TRUE when + linker map file is used. + * testsuite/ld-scripts/rgn-over1.d: Updated. + * testsuite/ld-scripts/rgn-over2.d: Likewise. + * testsuite/ld-scripts/rgn-over3.d: Likewise. + * testsuite/ld-scripts/rgn-over4.d: Likewise. + * testsuite/ld-scripts/rgn-over5.d: Likewise. + * testsuite/ld-scripts/rgn-over6.d: Likewise. + * testsuite/ld-scripts/rgn-over7.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt1a-x32.d: Check linker map + file. + * testsuite/ld-x86-64/property-x86-ibt1a.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt1a.map: New file. + 2018-12-04 H.J. Lu <hongjiu.lu@intel.com> PR ld/23372 @@ -1,5 +1,7 @@ -*- text -*- +* Report property change in linker map file when merging GNU properties. + * Add support for the C-SKY processor series. Changes in 2.31: @@ -759,6 +759,28 @@ option is used: See @ref{Expressions} for more information about expressions in linker scripts. + +@item How GNU properties are merged. + +When linker merges input .note.gnu.property sections into one output +.note.gnu.property section, some properties are removed or updated, +which are reported in the link map as + +@smallexample +Removed property 0xc0000002 to merge foo.o (0x1) and bar.o (not found) +@end smallexample + +It indicates that property 0xc0000002 is removed from output when +merging properties in @file{foo.o}, whose property 0xc0000002 value +is 0x1, and @file{bar.o}, which doesn't have property 0xc0000002. + +@smallexample +Updated property 0xc0000002 (0x1) to merge foo.o (0x1) and bar.o (0x1) +@end smallexample + +It indicates that property 0xc0010001 value is updated to 0x1 in output +when merging properties in @file{foo.o}, whose 0xc0010001 property value +is 0x1, and @file{bar.o}, whose 0xc0010001 property value is 0x1. @end itemize @kindex -n diff --git a/ld/ldmain.c b/ld/ldmain.c index 24a40aa1..b7f51ab 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -434,6 +434,7 @@ main (int argc, char **argv) config.map_filename); } } + link_info.has_map_file = TRUE; } lang_process (); diff --git a/ld/testsuite/ld-scripts/rgn-over1.d b/ld/testsuite/ld-scripts/rgn-over1.d index 54892be..902380e 100644 --- a/ld/testsuite/ld-scripts/rgn-over1.d +++ b/ld/testsuite/ld-scripts/rgn-over1.d @@ -3,6 +3,7 @@ # ld: -T rgn-over1.t -Map tmpdir/rgn-over1.map # error: \A[^ \n]*?ld[^:\n]*?: [^\n]*?section \`.text' will not fit in region `r1'\n[^ \n]*?ld[^:\n]*?: region `r1' overflowed by 16 bytes\Z +#... Discarded input sections #... Memory\s+Configuration diff --git a/ld/testsuite/ld-scripts/rgn-over2.d b/ld/testsuite/ld-scripts/rgn-over2.d index 1a5afea..1d7a8f9 100644 --- a/ld/testsuite/ld-scripts/rgn-over2.d +++ b/ld/testsuite/ld-scripts/rgn-over2.d @@ -3,6 +3,7 @@ # ld: -T rgn-over2.t -Map tmpdir/rgn-over2.map # error: \A[^ \n]*?ld[^:\n]*?: [^\n]*?section `\.data' will not fit in region `r1'\n[^ \n]*?ld[^:\n]*?: region `r1' overflowed by 4 bytes\Z +#... Discarded input sections #... Memory\s+Configuration diff --git a/ld/testsuite/ld-scripts/rgn-over3.d b/ld/testsuite/ld-scripts/rgn-over3.d index 76fa7c5..58d1a27 100644 --- a/ld/testsuite/ld-scripts/rgn-over3.d +++ b/ld/testsuite/ld-scripts/rgn-over3.d @@ -3,6 +3,7 @@ # ld: -T rgn-over3.t -Map tmpdir/rgn-over3.map # error: \A[^ \n]*?ld[^:\n]*?: [^\n]*?section `\.text' will not fit in region `r1'\n[^ \n]*?ld[^:\n]*?: [^\n]*?section `\.data' will not fit in region `r2'\n[^ \n]*?ld[^:\n]*?: region `r1' overflowed by 4 bytes\n[^ \n]*?ld[^:\n]*?: region `r2' overflowed by 4 bytes\Z +#... Discarded input sections #... Memory\s+Configuration diff --git a/ld/testsuite/ld-scripts/rgn-over4.d b/ld/testsuite/ld-scripts/rgn-over4.d index 1087aec..8ae150d 100644 --- a/ld/testsuite/ld-scripts/rgn-over4.d +++ b/ld/testsuite/ld-scripts/rgn-over4.d @@ -3,6 +3,7 @@ # ld: -T rgn-over4.t -Map tmpdir/rgn-over4.map # error: \A[^ \n]*?ld[^:\n]*?: [^:\n]*?section `\.text' will not fit in region `r1'\n[^ \n]*?ld[^:\n]*?: region `r1' overflowed by 16 bytes\Z +#... Discarded input sections #... Memory\s+Configuration diff --git a/ld/testsuite/ld-scripts/rgn-over5.d b/ld/testsuite/ld-scripts/rgn-over5.d index 734d9fe..10a7658 100644 --- a/ld/testsuite/ld-scripts/rgn-over5.d +++ b/ld/testsuite/ld-scripts/rgn-over5.d @@ -3,6 +3,7 @@ # ld: -T rgn-over5.t -Map tmpdir/rgn-over5.map # error: \A[^ \n]*?ld[^:\n]*?: [^\n]*?section `\.text' will not fit in region `v1'\n[^ \n]*?ld[^:\n]*?: region `v1' overflowed by 16 bytes\Z +#... Discarded input sections #... Memory\s+Configuration diff --git a/ld/testsuite/ld-scripts/rgn-over6.d b/ld/testsuite/ld-scripts/rgn-over6.d index 00b41d0..66c5a16 100644 --- a/ld/testsuite/ld-scripts/rgn-over6.d +++ b/ld/testsuite/ld-scripts/rgn-over6.d @@ -3,6 +3,7 @@ # ld: -T rgn-over6.t -Map tmpdir/rgn-over6.map # error: \A[^ \n]*?ld[^:\n]*?: [^\n]*?section `\.text' will not fit in region `r1'\n[^ \n]*?ld[^:\n]*?: [^\n]*?section `\.text' will not fit in region `v1'\n[^ \n]*?ld[^:\n]*?: region `r1' overflowed by 16 bytes\n[^ \n]*?ld[^:\n]*?: region `v1' overflowed by 16 bytes\Z +#... Discarded input sections #... Memory\s+Configuration diff --git a/ld/testsuite/ld-scripts/rgn-over7.d b/ld/testsuite/ld-scripts/rgn-over7.d index 74abb5c..3fc70cf 100644 --- a/ld/testsuite/ld-scripts/rgn-over7.d +++ b/ld/testsuite/ld-scripts/rgn-over7.d @@ -3,6 +3,7 @@ # ld: -T rgn-over7.t -Map tmpdir/rgn-over7.map # error: \A[^ \n]*?ld[^:\n]*?: [^\n]*?section `\.text' will not fit in region `r1'\n[^ \n]*?ld[^:\n]*?: section \.data LMA \[0+1008,0+1013\] overlaps section \.text LMA \[0+1000,0+100b\]\n[^ \n]*?ld[^:\n]*?: region `r1' overflowed by 4 bytes\Z +#... Discarded input sections #... Memory\s+Configuration diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt1a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt1a-x32.d index 7a95401..d05ab1d 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt1a-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt1a-x32.d @@ -1,8 +1,9 @@ #source: property-x86-empty.s #source: property-x86-ibt.s #as: --x32 -mx86-used-note=yes -#ld: -r -m elf32_x86_64 +#ld: -r -m elf32_x86_64 -Map tmpdir/property-x86-ibt1a-x32.map #readelf: -n +#map: property-x86-ibt1a.map Displaying notes found in: .note.gnu.property Owner Data size Description diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt1a.d b/ld/testsuite/ld-x86-64/property-x86-ibt1a.d index e989a8a..f8d6a06 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt1a.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt1a.d @@ -1,8 +1,9 @@ #source: property-x86-empty.s #source: property-x86-ibt.s #as: --64 -defsym __64_bit__=1 -mx86-used-note=yes -#ld: -r -melf_x86_64 +#ld: -r -melf_x86_64 -Map tmpdir/property-x86-ibt1a.map #readelf: -n +#map: property-x86-ibt1a.map Displaying notes found in: .note.gnu.property Owner Data size Description diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt1a.map b/ld/testsuite/ld-x86-64/property-x86-ibt1a.map new file mode 100644 index 0000000..976c835 --- /dev/null +++ b/ld/testsuite/ld-x86-64/property-x86-ibt1a.map @@ -0,0 +1,3 @@ +#... +Removed property 0xc0000002 to merge tmpdir/property-x86-empty.o \(0x0\) and tmpdir/property-x86-ibt.o \(0x1\) +#pass |