diff options
Diffstat (limited to 'ld')
37 files changed, 358 insertions, 39 deletions
@@ -1,5 +1,8 @@ -*- text -*- +* Add -z common/-z nocommon options for ELF targets to control whether to + convert common symbols to the STT_COMMON type during a relocatable link. + Changes in 2.26: * Add --fix-stm32l4xx-629360 to the ARM linker to enable a link-time diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em index d9d3393ec04..f3ec875a7ee 100644 --- a/ld/emultempl/elf32.em +++ b/ld/emultempl/elf32.em @@ -2421,6 +2421,10 @@ fragment <<EOF link_info.relro = TRUE; else if (strcmp (optarg, "norelro") == 0) link_info.relro = FALSE; + else if (strcmp (optarg, "common") == 0) + link_info.elf_stt_common = elf_stt_common; + else if (strcmp (optarg, "nocommon") == 0) + link_info.elf_stt_common = no_elf_stt_common; else if (strcmp (optarg, "text") == 0) link_info.error_textrel = TRUE; else if (strcmp (optarg, "notext") == 0) diff --git a/ld/ld.texinfo b/ld/ld.texinfo index 723e5e8ca2c..26a27de0a54 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texinfo @@ -1092,6 +1092,10 @@ The recognized keywords are: Combines multiple reloc sections and sorts them to make dynamic symbol lookup caching possible. +@item common +Generate common symbols with the STT_COMMON type druing a relocatable +link. + @item defs Disallows undefined symbols in object files. Undefined symbols in shared libraries are still allowed. @@ -1132,6 +1136,10 @@ Allows multiple definitions. @item nocombreloc Disables multiple reloc sections combining. +@item nocommon +Generate common symbols with the STT_OBJECT type druing a relocatable +link. + @item nocopyreloc Disable linker generated .dynbss variables used in place of variables defined in shared libraries. May result in dynamic text relocations. diff --git a/ld/lexsup.c b/ld/lexsup.c index 559472f39f0..6e0f9329982 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -1759,6 +1759,10 @@ elf_shlib_list_options (FILE *file) fprintf (file, _("\ -z norelro Don't create RELRO program header\n")); fprintf (file, _("\ + -z common Generate common symbols with STT_COMMON type\n")); + fprintf (file, _("\ + -z nocommon Generate common symbols with STT_OBJECT type\n")); + fprintf (file, _("\ -z stacksize=SIZE Set size of stack segment\n")); fprintf (file, _("\ -z text Treat DT_TEXTREL in shared object as error\n")); diff --git a/ld/testsuite/ld-elf/tls_common.exp b/ld/testsuite/ld-elf/tls_common.exp index 92240bf2a27..f546e438279 100644 --- a/ld/testsuite/ld-elf/tls_common.exp +++ b/ld/testsuite/ld-elf/tls_common.exp @@ -41,17 +41,19 @@ global srcdir global subdir global link_output -if { ![ld_assemble $as $srcdir/$subdir/tls_common.s tmpdir/tls_common.o ] } { +if { ![ld_assemble $as "--elf-stt-common=no $srcdir/$subdir/tls_common.s" tmpdir/tls_commona.o] + || ![ld_assemble $as "--elf-stt-common=yes $srcdir/$subdir/tls_common.s" tmpdir/tls_commonb.o] } { unresolved "tls_common" return } -if { ![ld_simple_link $ld tmpdir/tls_common1.o "-r tmpdir/tls_common.o"] } { +if { ![ld_simple_link $ld tmpdir/tls_common1a.o "-r tmpdir/tls_commona.o"] + || ![ld_simple_link $ld tmpdir/tls_common1b.o "-r tmpdir/tls_commona.o"] } { fail "tls_common" return } -if { ![ld_simple_link $ld tmpdir/tls_common "tmpdir/tls_common1.o"] } { +if { ![ld_simple_link $ld tmpdir/tls_commona "tmpdir/tls_common1a.o"] } { if { [string match "*not supported*" $link_output] || [string match "*unrecognized option*" $link_output] } { unsupported "$ld_options is not supported by this target" @@ -63,7 +65,26 @@ if { ![ld_simple_link $ld tmpdir/tls_common "tmpdir/tls_common1.o"] } { return } -set readelf_output [run_host_cmd "$READELF" "-l --wide tmpdir/tls_common"] +if { ![ld_simple_link $ld tmpdir/tls_commonb "tmpdir/tls_common1b.o"] } { + if { [string match "*not supported*" $link_output] + || [string match "*unrecognized option*" $link_output] } { + unsupported "$ld_options is not supported by this target" + } elseif { [string match "*Warning*alignment*of common symbol*" $link_output] } { + fail "tls_common" + } else { + unresolved "tls_common" + } + return +} + +set readelf_output [run_host_cmd "$READELF" "-l --wide tmpdir/tls_commona"] +if ![regexp ".*TLS.*0x0+ 0x0+4 R .*" $readelf_output] then { + send_log "$readelf_output\n" + fail "tls_common" + return +} + +set readelf_output [run_host_cmd "$READELF" "-l --wide tmpdir/tls_commona"] if ![regexp ".*TLS.*0x0+ 0x0+4 R .*" $readelf_output] then { send_log "$readelf_output\n" fail "tls_common" diff --git a/ld/testsuite/ld-elfcomm/common-1.s b/ld/testsuite/ld-elfcomm/common-1.s new file mode 100644 index 00000000000..97e2bf457b7 --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-1.s @@ -0,0 +1,3 @@ + .data + .dc.a foobar + .comm foobar,30,4 diff --git a/ld/testsuite/ld-elfcomm/common-1a.d b/ld/testsuite/ld-elfcomm/common-1a.d new file mode 100644 index 00000000000..28ed86b28b3 --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-1a.d @@ -0,0 +1,8 @@ +#source: common-1.s +#as: --elf-stt-common=yes +#ld: -r +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +COMMON +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/common-1b.d b/ld/testsuite/ld-elfcomm/common-1b.d new file mode 100644 index 00000000000..f0d135aee83 --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-1b.d @@ -0,0 +1,8 @@ +#source: common-1.s +#as: --elf-stt-common=no +#ld: -r +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +OBJECT +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/common-1c.d b/ld/testsuite/ld-elfcomm/common-1c.d new file mode 100644 index 00000000000..c2805c3e156 --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-1c.d @@ -0,0 +1,8 @@ +#source: common-1.s +#as: --elf-stt-common=yes +#ld: -r -z nocommon +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +OBJECT +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/common-1d.d b/ld/testsuite/ld-elfcomm/common-1d.d new file mode 100644 index 00000000000..33c5c4392f9 --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-1d.d @@ -0,0 +1,8 @@ +#source: common-1.s +#as: --elf-stt-common=yes +#ld: -r -z common +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +COMMON +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/common-1e.d b/ld/testsuite/ld-elfcomm/common-1e.d new file mode 100644 index 00000000000..a296db338da --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-1e.d @@ -0,0 +1,8 @@ +#source: common-1.s +#as: --elf-stt-common=no +#ld: -r -z common +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +COMMON +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/common-1f.d b/ld/testsuite/ld-elfcomm/common-1f.d new file mode 100644 index 00000000000..91b530adc32 --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-1f.d @@ -0,0 +1,8 @@ +#source: common-1.s +#as: --elf-stt-common=no +#ld: -r -z nocommon +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +OBJECT +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/common-2.s b/ld/testsuite/ld-elfcomm/common-2.s new file mode 100644 index 00000000000..9e51c8e19cd --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-2.s @@ -0,0 +1,3 @@ + .data + .dc.a foobar + .tls_common foobar,30,4 diff --git a/ld/testsuite/ld-elfcomm/common-2a.d b/ld/testsuite/ld-elfcomm/common-2a.d new file mode 100644 index 00000000000..aacaad4bdc3 --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-2a.d @@ -0,0 +1,8 @@ +#source: common-2.s +#as: --elf-stt-common=yes +#ld: -r +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +TLS +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/common-2b.d b/ld/testsuite/ld-elfcomm/common-2b.d new file mode 100644 index 00000000000..4cb9e8e3c58 --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-2b.d @@ -0,0 +1,8 @@ +#source: common-2.s +#as: --elf-stt-common=no +#ld: -r +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +TLS +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/common-2c.d b/ld/testsuite/ld-elfcomm/common-2c.d new file mode 100644 index 00000000000..c4ddd6a2917 --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-2c.d @@ -0,0 +1,8 @@ +#source: common-2.s +#as: --elf-stt-common=yes +#ld: -r -z common +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +TLS +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/common-2d.d b/ld/testsuite/ld-elfcomm/common-2d.d new file mode 100644 index 00000000000..577c381b9ca --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-2d.d @@ -0,0 +1,8 @@ +#source: common-2.s +#as: --elf-stt-common=yes +#ld: -r -z nocommon +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +TLS +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/common-2e.d b/ld/testsuite/ld-elfcomm/common-2e.d new file mode 100644 index 00000000000..e6a3649a75d --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-2e.d @@ -0,0 +1,8 @@ +#source: common-2.s +#as: --elf-stt-common=no +#ld: -r -z common +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +TLS +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/common-2f.d b/ld/testsuite/ld-elfcomm/common-2f.d new file mode 100644 index 00000000000..728a0993a65 --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-2f.d @@ -0,0 +1,8 @@ +#source: common-2.s +#as: --elf-stt-common=no +#ld: -r -z nocommon +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +TLS +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/common-3a.rd b/ld/testsuite/ld-elfcomm/common-3a.rd new file mode 100644 index 00000000000..5d755721dbc --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-3a.rd @@ -0,0 +1,6 @@ +#ld: -r +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +OBJECT +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/common-3b.rd b/ld/testsuite/ld-elfcomm/common-3b.rd new file mode 100644 index 00000000000..7859718efe1 --- /dev/null +++ b/ld/testsuite/ld-elfcomm/common-3b.rd @@ -0,0 +1,6 @@ +#ld: -r +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +COMMON +GLOBAL +DEFAULT +COM +foobar +#pass diff --git a/ld/testsuite/ld-elfcomm/dummy.s b/ld/testsuite/ld-elfcomm/dummy.s new file mode 100644 index 00000000000..403f98000d9 --- /dev/null +++ b/ld/testsuite/ld-elfcomm/dummy.s @@ -0,0 +1 @@ +# Dummy diff --git a/ld/testsuite/ld-elfcomm/elfcomm.exp b/ld/testsuite/ld-elfcomm/elfcomm.exp index 81fd5201069..926b98ce7a0 100644 --- a/ld/testsuite/ld-elfcomm/elfcomm.exp +++ b/ld/testsuite/ld-elfcomm/elfcomm.exp @@ -144,7 +144,7 @@ proc stt_common_test { options testname } { global READELF global ld - set options "$options tmpdir/common1a.o" + set options "$options tmpdir/common1c.o" if { ! [ld_simple_link $ld tmpdir/common.exe $options] } { unresolved $testname @@ -154,7 +154,7 @@ proc stt_common_test { options testname } { send_log "$READELF --syms tmpdir/common.exe | grep foo\n" set exec_output [run_host_cmd "$READELF" "--syms tmpdir/common.exe | grep foo"] - if {![regexp "(\[ \]*)(\[0-9\]+):(\[ \]*)(\[0-9\]+)(\[ \]+)(\[0-9\]+)(\[ \]+)COMMON(\[ \]+)GLOBAL(\[ \]+)DEFAULT(\[ \]+)(\[0-9\]+)(\[ \]+)_?foo2" $exec_output] } { + if {![regexp { +[0-9a-f]+. +[0-9a-f]+ OBJECT + GLOBAL +DEFAULT +[0-9]+ _?foo2} $exec_output] } { fail $testname return 0 } @@ -163,23 +163,6 @@ proc stt_common_test { options testname } { return 1 } -# Check to see if the assembler is generating symbols with the STT_COMMON type. -proc assembler_generates_commons {} { - global exec_output - global READELF - - verbose "Check to see if STT_COMMON symbols are being generated:" - set exec_output [run_host_cmd "$READELF" "--syms tmpdir/common1a.o | grep foo"] - - if { ![regexp "(\[ \]*)(\[0-9\]+):(\[ \]*)(\[0\]*)80(\[ \]+).(\[ \]+)COMMON(\[ \]+)GLOBAL(\[ \]+)DEFAULT(\[ \]+)(PRC\\\[0xff03\\\]|COM|SCOM)(\[ \]+)_?foo2" $exec_output] } { - verbose "STT_COMMON not generated" - return 0 - } - - verbose "STT_COMMON's are generated" - return 1 -} - if [istarget nios2*-*-*] { set CFLAGS "$CFLAGS -G0" } @@ -187,7 +170,9 @@ if [istarget nios2*-*-*] { # Explicitly use "-fcommon" so that even if $CFLAGS includes # "-fno-common", these tests are compiled as expected. if { ![ld_compile "$CC $CFLAGS -fcommon" $srcdir/$subdir/common1a.c tmpdir/common1a.o] - || ![ld_compile "$CC $CFLAGS -fcommon" $srcdir/$subdir/common1b.c tmpdir/common1b.o] } { + || ![ld_compile "$CC $CFLAGS -fcommon" $srcdir/$subdir/common1b.c tmpdir/common1b.o] + || ![ld_compile "$CC $CFLAGS -Wa,--elf-stt-common=yes -fcommon" $srcdir/$subdir/common1b.c tmpdir/common1c.o] } { + unresolved $test1 unresolved $test1 return } @@ -261,12 +246,56 @@ if { [dump_common1 $test1c2] } { # # The following tests are for when we are generating STT_COMMON symbols only. # - -if { ![assembler_generates_commons] } { - return -} - stt_common_test "-static -e 0" "static link of common symbols" stt_common_test "-shared" "shared link of common symbols" stt_common_test "-pie" "position independent link of common symbols" +run_ld_link_tests [list \ + [list \ + "Build common-3x.o" \ + "-r" "" "--elf-stt-common=no" \ + {common-1.s} {} "common-3x.o" \ + ] \ + [list \ + "Build common-3y.o" \ + "-r" "" "--elf-stt-common=yes" \ + {common-1.s} {} "common-3y.o" \ + ] \ + [list \ + "Build common-3a.o" \ + "-r tmpdir/common-3x.o tmpdir/common-3y.o" "" "" \ + {dummy.s} {{readelf {-s -W} common-3a.rd}} "common-3a.o" \ + ] \ + [list \ + "Build common-3b.o" \ + "-r tmpdir/common-3y.o tmpdir/common-3x.o" "" "" \ + {dummy.s} {{readelf {-s -W} common-3b.rd}} "common-3b.o" \ + ] \ + [list \ + "Build common-3c.o" \ + "-r -z nocommon tmpdir/common-3x.o tmpdir/common-3y.o" "" "" \ + {dummy.s} {{readelf {-s -W} common-3a.rd}} "common-3c.o" \ + ] \ + [list \ + "Build common-3d.o" \ + "-r -z common tmpdir/common-3x.o tmpdir/common-3y.o" "" "" \ + {dummy.s} {{readelf {-s -W} common-3b.rd}} "common-3b.o" \ + ] \ + [list \ + "Build common-3e.o" \ + "-r -z common tmpdir/common-3y.o tmpdir/common-3x.o" "" "" \ + {dummy.s} {{readelf {-s -W} common-3b.rd}} "common-3e.o" \ + ] \ + [list \ + "Build common-3f.o" \ + "-r -z nocommon tmpdir/common-3y.o tmpdir/common-3x.o" "" "" \ + {dummy.s} {{readelf {-s -W} common-3a.rd}} "common-3f.o" \ + ] \ +] + +set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]] +foreach t $test_list { + # We need to strip the ".d", but can leave the dirname. + verbose [file rootname $t] + run_dump_test [file rootname $t] +} diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 1a79694943b..1b68d3103f4 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -320,6 +320,7 @@ run_dump_test "load5b" run_dump_test "load6" run_dump_test "pr19175" run_dump_test "pr19615" +run_dump_test "pr19645" if { !([istarget "i?86-*-linux*"] || [istarget "i?86-*-gnu*"] diff --git a/ld/testsuite/ld-i386/pr19645.d b/ld/testsuite/ld-i386/pr19645.d new file mode 100644 index 00000000000..10b40b869ee --- /dev/null +++ b/ld/testsuite/ld-i386/pr19645.d @@ -0,0 +1,13 @@ +#as: --32 --elf-stt-common=yes +#ld: -shared -Bsymbolic-functions -melf_i386 +#readelf: -r --wide --dyn-syms + +Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym. Value +Symbol's Name +[0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +[0-9a-f]+ +foobar + +Symbol table '.dynsym' contains [0-9]+ entries: + Num: Value Size Type Bind Vis Ndx Name +#... + +[0-9]+: +[0-9a-f]+ +30 +OBJECT +GLOBAL +DEFAULT +[0-9]+ foobar +#pass diff --git a/ld/testsuite/ld-i386/pr19645.s b/ld/testsuite/ld-i386/pr19645.s new file mode 100644 index 00000000000..5dadebeebfc --- /dev/null +++ b/ld/testsuite/ld-i386/pr19645.s @@ -0,0 +1,6 @@ + .text + .global bar + .type bar,"function" +bar: + movl foobar@GOT(%ebx), %eax + .comm foobar,30,4 diff --git a/ld/testsuite/ld-x86-64/dwarfreloc.exp b/ld/testsuite/ld-x86-64/dwarfreloc.exp index afe5f6c0390..959ae9c2571 100644 --- a/ld/testsuite/ld-x86-64/dwarfreloc.exp +++ b/ld/testsuite/ld-x86-64/dwarfreloc.exp @@ -41,18 +41,31 @@ if { !([istarget "x86_64-*-elf*"] } set build_tests_ld { - {"Build dwarfreloc1x.o" - "-r" "" "" - {dwarfreloc1.s} {} "dwarfreloc1x.o"} - {"Build dwarfreloc2.o" - "-r" "" "" - {dwarfreloc2.s} {} "dwarfreloc2x.o"} + {"Build dwarfreloc1xa.o" + "-r" "" "--elf-stt-common=no" + {dwarfreloc1.s} {} "dwarfreloc1xa.o"} + {"Build dwarfreloc1xb.o" + "-r" "" "--elf-stt-common=yes" + {dwarfreloc1.s} {} "dwarfreloc1xb.o"} + {"Build dwarfreloc2a.o" + "-r" "" "--elf-stt-common=no" + {dwarfreloc2.s} {} "dwarfreloc2xa.o"} + {"Build dwarfreloc2b.o" + "-r" "" "--elf-stt-common=yes" + {dwarfreloc2.s} {} "dwarfreloc2xb.o"} } run_ld_link_tests $build_tests_ld -set testname "Link dwarfreloc1x.o and dwarfreloc2x.o to dwarfreloc.o" -if [ld_simple_link $ld "tmpdir/dwarfreloc.o" "-r tmpdir/dwarfreloc1x.o tmpdir/dwarfreloc2x.o"] { +set testname "Link dwarfreloc1xa.o and dwarfreloc2xa.o to dwarfreloca.o" +if [ld_simple_link $ld "tmpdir/dwarfreloca.o" "-r tmpdir/dwarfreloc1xa.o tmpdir/dwarfreloc2xa.o"] { + pass $testname +} else { + fail $testname +} + +set testname "Link dwarfreloc1xb.o and dwarfreloc2xb.o to dwarfrelocb.o" +if [ld_simple_link $ld "tmpdir/dwarfrelocb.o" "-r tmpdir/dwarfreloc1xb.o tmpdir/dwarfreloc2xb.o"] { pass $testname } else { fail $testname @@ -61,9 +74,34 @@ if [ld_simple_link $ld "tmpdir/dwarfreloc.o" "-r tmpdir/dwarfreloc1x.o tmpdir/dw # The code is copied from `ld-lib.exp'. We cannot use the functions there as # they expect source (.s or .c) files while we to check a `ld -r' output (.o). -set testname "Check dwarfreloc.o readelf" +set testname "Check dwarfreloca.o readelf" +set dumpfile "dwarfreloc.rd" +set cmd "$READELF --debug-dump=info tmpdir/dwarfreloca.o" +set status [remote_exec host [concat sh -c [list "$cmd >dump.out 2>ld.stderr"]] "" "/dev/null"] +send_log "$cmd\n" +remote_upload host "ld.stderr" +set comp_output [prune_warnings [file_contents "ld.stderr"]] +remote_file host delete "ld.stderr" +remote_file build delete "ld.stderr" + +if ![string match "" $comp_output] then { + send_log "$comp_output\n" + fail $testname +} else { + remote_upload host "dump.out" + if { [regexp_diff "dump.out" "$srcdir/$subdir/$dumpfile"] } then { + verbose "output is [file_contents "dump.out"]" 2 + fail $testname + } else { + pass $testname + } + remote_file build delete "dump.out" + remote_file host delete "dump.out" +} + +set testname "Check dwarfrelocb.o readelf" set dumpfile "dwarfreloc.rd" -set cmd "$READELF --debug-dump=info tmpdir/dwarfreloc.o" +set cmd "$READELF --debug-dump=info tmpdir/dwarfrelocb.o" set status [remote_exec host [concat sh -c [list "$cmd >dump.out 2>ld.stderr"]] "" "/dev/null"] send_log "$cmd\n" remote_upload host "ld.stderr" diff --git a/ld/testsuite/ld-x86-64/largecomm-1.s b/ld/testsuite/ld-x86-64/largecomm-1.s new file mode 100644 index 00000000000..cfadc4f9613 --- /dev/null +++ b/ld/testsuite/ld-x86-64/largecomm-1.s @@ -0,0 +1,3 @@ + .data + .dc.a foobar + .largecomm foobar,30,4 diff --git a/ld/testsuite/ld-x86-64/largecomm-1a.d b/ld/testsuite/ld-x86-64/largecomm-1a.d new file mode 100644 index 00000000000..63462bf4f43 --- /dev/null +++ b/ld/testsuite/ld-x86-64/largecomm-1a.d @@ -0,0 +1,8 @@ +#source: largecomm-1.s +#as: --elf-stt-common=yes +#ld: -r +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +COMMON +GLOBAL +DEFAULT +LARGE_COM +foobar +#pass diff --git a/ld/testsuite/ld-x86-64/largecomm-1b.d b/ld/testsuite/ld-x86-64/largecomm-1b.d new file mode 100644 index 00000000000..8f62d0d0fd7 --- /dev/null +++ b/ld/testsuite/ld-x86-64/largecomm-1b.d @@ -0,0 +1,8 @@ +#source: largecomm-1.s +#as: --elf-stt-common=no +#ld: -r +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +OBJECT +GLOBAL +DEFAULT +LARGE_COM +foobar +#pass diff --git a/ld/testsuite/ld-x86-64/largecomm-1c.d b/ld/testsuite/ld-x86-64/largecomm-1c.d new file mode 100644 index 00000000000..7e6a8cc0f64 --- /dev/null +++ b/ld/testsuite/ld-x86-64/largecomm-1c.d @@ -0,0 +1,8 @@ +#source: largecomm-1.s +#as: --elf-stt-common=yes +#ld: -r -z nocommon +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +OBJECT +GLOBAL +DEFAULT +LARGE_COM +foobar +#pass diff --git a/ld/testsuite/ld-x86-64/largecomm-1d.d b/ld/testsuite/ld-x86-64/largecomm-1d.d new file mode 100644 index 00000000000..4025e7baa1f --- /dev/null +++ b/ld/testsuite/ld-x86-64/largecomm-1d.d @@ -0,0 +1,8 @@ +#source: largecomm-1.s +#as: --elf-stt-common=yes +#ld: -r -z common +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +COMMON +GLOBAL +DEFAULT +LARGE_COM +foobar +#pass diff --git a/ld/testsuite/ld-x86-64/largecomm-1e.d b/ld/testsuite/ld-x86-64/largecomm-1e.d new file mode 100644 index 00000000000..b1a3a039dd4 --- /dev/null +++ b/ld/testsuite/ld-x86-64/largecomm-1e.d @@ -0,0 +1,8 @@ +#source: largecomm-1.s +#as: --elf-stt-common=no +#ld: -r -z common +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +COMMON +GLOBAL +DEFAULT +LARGE_COM +foobar +#pass diff --git a/ld/testsuite/ld-x86-64/largecomm-1f.d b/ld/testsuite/ld-x86-64/largecomm-1f.d new file mode 100644 index 00000000000..3b5bd920e69 --- /dev/null +++ b/ld/testsuite/ld-x86-64/largecomm-1f.d @@ -0,0 +1,8 @@ +#source: largecomm-1.s +#as: --elf-stt-common=no +#ld: -r -z nocommon +#readelf: -s -W + +#... + +[0-9]+: +0+4 +30 +OBJECT +GLOBAL +DEFAULT +LARGE_COM +foobar +#pass diff --git a/ld/testsuite/ld-x86-64/pr19645.d b/ld/testsuite/ld-x86-64/pr19645.d new file mode 100644 index 00000000000..9445fda55d3 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr19645.d @@ -0,0 +1,13 @@ +#as: --64 --elf-stt-common=yes +#ld: -shared -Bsymbolic-functions -melf_x86_64 +#readelf: -r --wide --dyn-syms + +Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_GLOB_DAT +[0-9a-f]+ +foobar \+ 0 + +Symbol table '.dynsym' contains [0-9]+ entries: + +Num: +Value +Size +Type +Bind +Vis +Ndx +Name +#... + +[0-9]+: +[0-9a-f]+ +30 +OBJECT +GLOBAL +DEFAULT +[0-9]+ foobar +#pass diff --git a/ld/testsuite/ld-x86-64/pr19645.s b/ld/testsuite/ld-x86-64/pr19645.s new file mode 100644 index 00000000000..88331ed5d3c --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr19645.s @@ -0,0 +1,6 @@ + .text + .global bar + .type bar,"function" +bar: + movq foobar@GOTPCREL(%rip), %rax + .comm foobar,30,4 diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 7248377c9b6..9fa43579008 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -239,6 +239,12 @@ run_dump_test "pr14215" run_dump_test "pr14207" run_dump_test "gotplt1" run_dump_test "pie1" +run_dump_test "largecomm-1a" +run_dump_test "largecomm-1b" +run_dump_test "largecomm-1c" +run_dump_test "largecomm-1d" +run_dump_test "largecomm-1e" +run_dump_test "largecomm-1f" if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { return @@ -355,6 +361,7 @@ run_dump_test "pr19162" run_dump_test "pr19175" run_dump_test "pr18591" run_dump_test "pr19615" +run_dump_test "pr19645" # Add $PLT_CFLAGS if PLT is expected. global PLT_CFLAGS |