diff options
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/shared.exp | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index e27d5f0..c839971 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,10 @@ 2016-03-02 H.J. Lu <hongjiu.lu@intel.com> + * testsuite/ld-elf/shared.exp (mix_pic_and_non_pic): Add xfails. + Xfail mix_pic_and_non_pic on "arm*-*-*" "aarch64*-*-*". + +2016-03-02 H.J. Lu <hongjiu.lu@intel.com> + PR ld/19739 * emultempl/mmo.em (mmo_place_orphan): Don't merge flags of other input sections for relocatable link. diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp index e615f55..678ab1b 100644 --- a/ld/testsuite/ld-elf/shared.exp +++ b/ld/testsuite/ld-elf/shared.exp @@ -583,7 +583,7 @@ if { [istarget *-*-linux*] ] } -proc mix_pic_and_non_pic {cflags ldflags} { +proc mix_pic_and_non_pic {xfails cflags ldflags} { set testname "Mixing PIC and non-PIC" if { ![ string match "" $cflags$ldflags] } { set testname "$testname ($cflags $ldflags)" @@ -632,6 +632,10 @@ proc mix_pic_and_non_pic {cflags ldflags} { exec cp tmpdir/libpr19719a.so tmpdir/libpr19719.so + foreach targ $xfails { + setup_xfail $targ + } + set exec_output [run_host_cmd tmpdir/pr19719 ""] if {![string match "PASS" $exec_output]} { fail $testname @@ -640,5 +644,5 @@ proc mix_pic_and_non_pic {cflags ldflags} { } } -mix_pic_and_non_pic "" "" -mix_pic_and_non_pic "-fPIE" "-pie" +mix_pic_and_non_pic [list "arm*-*-*" "aarch64*-*-*"] "" "" +mix_pic_and_non_pic [] "-fPIE" "-pie" |