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.
diff --git a/sim/testsuite/cris/c/badldso1.c b/sim/testsuite/cris/c/badldso1.c
index 58caa8d..70414b5 100644
--- a/sim/testsuite/cris/c/badldso1.c
+++ b/sim/testsuite/cris/c/badldso1.c
@@ -1,6 +1,5 @@
/*
#notarget: cris*-*-elf
-#dynamic:
#xerror:
#output: *: could not load ELF interpreter `*' for program `*'\n
*/
diff --git a/sim/testsuite/cris/c/badldso2.c b/sim/testsuite/cris/c/badldso2.c
index db28889..92efc13 100644
--- a/sim/testsuite/cris/c/badldso2.c
+++ b/sim/testsuite/cris/c/badldso2.c
@@ -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
diff --git a/sim/testsuite/cris/c/badldso3.c b/sim/testsuite/cris/c/badldso3.c
index 3f9509b..9ff6d9a 100644
--- a/sim/testsuite/cris/c/badldso3.c
+++ b/sim/testsuite/cris/c/badldso3.c
@@ -1,6 +1,5 @@
/*
#notarget: cris*-*-elf
-#dynamic:
#xerror:
#cc: additional_flags=-Wl,-dynamic-linker,/compilercheck.x
#sim: --sysroot=@exedir@
diff --git a/sim/testsuite/cris/c/c.exp b/sim/testsuite/cris/c/c.exp
index 506f68a..8f39b09 100644
--- a/sim/testsuite/cris/c/c.exp
+++ b/sim/testsuite/cris/c/c.exp
@@ -105,7 +105,6 @@
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 @@
}
}
- 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
}
diff --git a/sim/testsuite/cris/c/hellodyn.c b/sim/testsuite/cris/c/hellodyn.c
index dc8042f..4a036cc 100644
--- a/sim/testsuite/cris/c/hellodyn.c
+++ b/sim/testsuite/cris/c/hellodyn.c
@@ -1,5 +1,4 @@
/*
-#dynamic:
#sim: --sysroot=@exedir@
*/
#include "hello.c"
diff --git a/sim/testsuite/cris/c/hellodyn2.c b/sim/testsuite/cris/c/hellodyn2.c
index 00f5369..2a94ea4 100644
--- a/sim/testsuite/cris/c/hellodyn2.c
+++ b/sim/testsuite/cris/c/hellodyn2.c
@@ -1,5 +1,4 @@
/*
-#dynamic:
#sim: --sysroot=@exedir@ --load-vma
*/
#include "hello.c"
diff --git a/sim/testsuite/cris/c/hellodyn3.c b/sim/testsuite/cris/c/hellodyn3.c
index 8ae3a4f..d21122f 100644
--- a/sim/testsuite/cris/c/hellodyn3.c
+++ b/sim/testsuite/cris/c/hellodyn3.c
@@ -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"
