sim: cris: drop custom "dynamic" test field

This tag is used to force tests to be built dynamically (i.e. without
-static linking).  This is because cris-sim.exp in dejagnu turns on
static linking in ldflags.

The default configs and runtest flags shouldn't load these boards.
If these settings are still needed, we should figure out a different
way of suppressing the stock settings wholesale.  We want these to
all pass out of the box with little to no configuration so that they
can run in a multitarget build.

With dropping "dynamic", it'll be easier to merge the custom cris
test logic with the common sim test logic.
This commit is contained in:
Mike Frysinger
2021-11-16 19:40:00 -05:00
parent 5ec501b574
commit b31ff1f79b
7 changed files with 0 additions and 17 deletions

View File

@ -1,6 +1,5 @@
/*
#notarget: cris*-*-elf
#dynamic:
#xerror:
#output: *: could not load ELF interpreter `*' for program `*'\n
*/

View File

@ -1,6 +1,5 @@
/*
#notarget: cris*-*-elf
#dynamic:
#xerror:
#cc: additional_flags=-Wl,-dynamic-linker,/dev/null
#output: *: could not load ELF interpreter `*' for program `*'\n

View File

@ -1,6 +1,5 @@
/*
#notarget: cris*-*-elf
#dynamic:
#xerror:
#cc: additional_flags=-Wl,-dynamic-linker,/compilercheck.x
#sim: --sysroot=@exedir@

View File

@ -105,7 +105,6 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c]] {
set opts(xfail) ""
set opts(target) ""
set opts(notarget) ""
set opts(dynamic) ""
# Clear any machine specific options specified in a previous test case
if [info exists opts(sim,$mach)] {
@ -142,16 +141,6 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c]] {
}
}
if { $opt_name == "dynamic" \
&& [info exists board_info([target_info name],ldflags)] } {
# Weed out -static from ldflags, but keep the original in
# $orig_ldflags.
set orig_ldflags $board_info([target_info name],ldflags)
set ldflags " $orig_ldflags "
regsub -all " -static " $ldflags " " ldflags
set board_info([target_info name],ldflags) $ldflags
}
foreach m $opt_machs {
set opts($opt_name,$m) $opt_val
}

View File

@ -1,5 +1,4 @@
/*
#dynamic:
#sim: --sysroot=@exedir@
*/
#include "hello.c"

View File

@ -1,5 +1,4 @@
/*
#dynamic:
#sim: --sysroot=@exedir@ --load-vma
*/
#include "hello.c"

View File

@ -3,7 +3,6 @@
ld.so.cache (having no absolute path specified for the executable
falls back on loading through the same mechanisms as a DSO).
#notarget: *-*-elf
#dynamic:
#sim: --sysroot=@exedir@ @exedir@/lib/ld.so.1 --library-path /
*/
#include "hello.c"