diff options
Diffstat (limited to 'ld/testsuite')
| -rw-r--r-- | ld/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/testsuite/ld-scripts/overlay-size.d | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-scripts/overlay-size.exp | 9 | ||||
| -rw-r--r-- | ld/testsuite/lib/ld-lib.exp | 34 |
4 files changed, 42 insertions, 9 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 9de8360..b6e3481 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2015-01-20 Andrew Burgess <andrew.burgess@embecosm.com> + + * ld-scripts/overlay-size.d: Add 'map' option. + * ld-scripts/overlay-size.exp: Remove manual check of mapfile. + * lib/ld-lib.exp (run_dump_test): Add support for new 'map' + option, checking linker mapfile output. + 2015-01-20 Alan Modra <amodra@gmail.com> * ld-powerpc/ambiguousv1.d, diff --git a/ld/testsuite/ld-scripts/overlay-size.d b/ld/testsuite/ld-scripts/overlay-size.d index 78a9c92..4e60150 100644 --- a/ld/testsuite/ld-scripts/overlay-size.d +++ b/ld/testsuite/ld-scripts/overlay-size.d @@ -1,6 +1,7 @@ # ld: -T overlay-size.t -Map tmpdir/overlay-size.map # name: overlay size # objdump: --headers +# map: overlay-size-map.d # xfail: rx-*-* # FAILS on the RX because the linker has to set LMA == VMA for the # Renesas loader. diff --git a/ld/testsuite/ld-scripts/overlay-size.exp b/ld/testsuite/ld-scripts/overlay-size.exp index 4dde289..e8e7a91 100644 --- a/ld/testsuite/ld-scripts/overlay-size.exp +++ b/ld/testsuite/ld-scripts/overlay-size.exp @@ -23,12 +23,3 @@ if ![is_elf_format] { } run_dump_test overlay-size - -set testname "overlay size (map check)" - -if [regexp_diff "tmpdir/overlay-size.map" \ - "$srcdir/$subdir/overlay-size-map.d"] { - fail $testname -} else { - pass $testname -} diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 3d980c9..0a25f86 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -555,6 +555,14 @@ proc ld_simple_link_defsyms {} { # both "error" and "warning". Multiple "warning" directives # append to the expected linker warning message. # +# map: FILE +# Adding this option will cause the linker to generate a linker +# map file, using the -Map=MAPFILE command line option. If +# there is no -Map=MAPFILE in the 'ld: FLAGS' then one will be +# added to the linker command line. The contents of the +# generated MAPFILE are then compared against the regexp lines +# in FILE using `regexp_diff' (see below for details). +# # Each option may occur at most once unless otherwise mentioned. # # After the option lines come regexp lines. `run_dump_test' calls @@ -607,6 +615,7 @@ proc run_dump_test { name {extra_options {}} } { set opts(warning) {} set opts(objcopy_linked_file) {} set opts(objcopy_objects) {} + set opts(map) {} foreach i $opt_array { set opt_name [lindex $i 0] @@ -860,6 +869,20 @@ proc run_dump_test { name {extra_options {}} } { set cmd "$LD $LDFLAGS -L$srcdir/$subdir \ $opts(ld) -o $objfile $objfiles $opts(ld_after_inputfiles)" + # If needed then check for, or add a -Map option. + set mapfile "" + if { $opts(map) != "" } then { + if { [regexp -- "-Map=(\[^ \]+)" $cmd all mapfile] } then { + # Found existing mapfile option + verbose -log "Existing mapfile '$mapfile' found" + } else { + # No mapfile option. + set mapfile "tmpdir/dump.map" + verbose -log "Adding mapfile '$mapfile'" + set cmd "$cmd -Map=$mapfile" + } + } + send_log "$cmd\n" set cmdret [remote_exec host [concat sh -c [list "$cmd 2>&1"]] "" "/dev/null" "ld.tmp"] remote_upload host "ld.tmp" @@ -908,6 +931,17 @@ proc run_dump_test { name {extra_options {}} } { return } } + + if { $opts(map) != "" } then { + # Check the map file matches. + set map_pattern_file $srcdir/$subdir/$opts(map) + verbose -log "Compare '$mapfile' against '$map_pattern_file'" + if { [regexp_diff $mapfile $map_pattern_file] } then { + fail "$testname (map file check)" + } else { + pass "$testname (map file check)" + } + } } else { set objfile "tmpdir/dump0.o" } |