mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-24 12:23:31 +08:00
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:
@ -1,6 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
#notarget: cris*-*-elf
|
#notarget: cris*-*-elf
|
||||||
#dynamic:
|
|
||||||
#xerror:
|
#xerror:
|
||||||
#output: *: could not load ELF interpreter `*' for program `*'\n
|
#output: *: could not load ELF interpreter `*' for program `*'\n
|
||||||
*/
|
*/
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
#notarget: cris*-*-elf
|
#notarget: cris*-*-elf
|
||||||
#dynamic:
|
|
||||||
#xerror:
|
#xerror:
|
||||||
#cc: additional_flags=-Wl,-dynamic-linker,/dev/null
|
#cc: additional_flags=-Wl,-dynamic-linker,/dev/null
|
||||||
#output: *: could not load ELF interpreter `*' for program `*'\n
|
#output: *: could not load ELF interpreter `*' for program `*'\n
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
#notarget: cris*-*-elf
|
#notarget: cris*-*-elf
|
||||||
#dynamic:
|
|
||||||
#xerror:
|
#xerror:
|
||||||
#cc: additional_flags=-Wl,-dynamic-linker,/compilercheck.x
|
#cc: additional_flags=-Wl,-dynamic-linker,/compilercheck.x
|
||||||
#sim: --sysroot=@exedir@
|
#sim: --sysroot=@exedir@
|
||||||
|
@ -105,7 +105,6 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c]] {
|
|||||||
set opts(xfail) ""
|
set opts(xfail) ""
|
||||||
set opts(target) ""
|
set opts(target) ""
|
||||||
set opts(notarget) ""
|
set opts(notarget) ""
|
||||||
set opts(dynamic) ""
|
|
||||||
|
|
||||||
# Clear any machine specific options specified in a previous test case
|
# Clear any machine specific options specified in a previous test case
|
||||||
if [info exists opts(sim,$mach)] {
|
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 {
|
foreach m $opt_machs {
|
||||||
set opts($opt_name,$m) $opt_val
|
set opts($opt_name,$m) $opt_val
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
/*
|
/*
|
||||||
#dynamic:
|
|
||||||
#sim: --sysroot=@exedir@
|
#sim: --sysroot=@exedir@
|
||||||
*/
|
*/
|
||||||
#include "hello.c"
|
#include "hello.c"
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
/*
|
/*
|
||||||
#dynamic:
|
|
||||||
#sim: --sysroot=@exedir@ --load-vma
|
#sim: --sysroot=@exedir@ --load-vma
|
||||||
*/
|
*/
|
||||||
#include "hello.c"
|
#include "hello.c"
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
ld.so.cache (having no absolute path specified for the executable
|
ld.so.cache (having no absolute path specified for the executable
|
||||||
falls back on loading through the same mechanisms as a DSO).
|
falls back on loading through the same mechanisms as a DSO).
|
||||||
#notarget: *-*-elf
|
#notarget: *-*-elf
|
||||||
#dynamic:
|
|
||||||
#sim: --sysroot=@exedir@ @exedir@/lib/ld.so.1 --library-path /
|
#sim: --sysroot=@exedir@ @exedir@/lib/ld.so.1 --library-path /
|
||||||
*/
|
*/
|
||||||
#include "hello.c"
|
#include "hello.c"
|
||||||
|
Reference in New Issue
Block a user