diff options
Diffstat (limited to 'gcc')
13 files changed, 26 insertions, 37 deletions
diff --git a/gcc/testsuite/gm2/complex/run/pass/complex-run-pass.exp b/gcc/testsuite/gm2/complex/run/pass/complex-run-pass.exp index a715ec2..399f30b 100644 --- a/gcc/testsuite/gm2/complex/run/pass/complex-run-pass.exp +++ b/gcc/testsuite/gm2/complex/run/pass/complex-run-pass.exp @@ -27,7 +27,6 @@ load_lib gm2-torture.exp set gm2src ${srcdir}/../gm2 -gm2_link_lib "m2iso m2pim" gm2_init_iso "${srcdir}/gm2/complex/run/pass" diff --git a/gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp b/gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp index 95b1303..09d04ee 100644 --- a/gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp +++ b/gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp @@ -24,7 +24,6 @@ if $tracelevel then { # load support procs load_lib gm2-torture.exp -gm2_link_lib "m2iso m2pim" gm2_init_iso "${srcdir}/gm2/iso/run/pass" -fsoft-check-all gm2_link_obj fileio.o diff --git a/gcc/testsuite/gm2/link/externalscaffold/pass/link-externalscaffold-pass.exp b/gcc/testsuite/gm2/link/externalscaffold/pass/link-externalscaffold-pass.exp index 26c9155..32d4315 100644 --- a/gcc/testsuite/gm2/link/externalscaffold/pass/link-externalscaffold-pass.exp +++ b/gcc/testsuite/gm2/link/externalscaffold/pass/link-externalscaffold-pass.exp @@ -25,7 +25,6 @@ if $tracelevel then { # load support procs load_lib gm2-torture.exp -gm2_link_lib "m2pim" gm2_init_pim "${srcdir}/gm2/pim/pass" -fscaffold-main -fno-scaffold-dynamic gm2_link_obj scaffold.o set output [target_compile $srcdir/$subdir/scaffold.c scaffold.o object "-g"] diff --git a/gcc/testsuite/gm2/pimlib/logitech/run/pass/pimlib-logitech-run-pass.exp b/gcc/testsuite/gm2/pimlib/logitech/run/pass/pimlib-logitech-run-pass.exp index 912c457..cfe9ff8 100644 --- a/gcc/testsuite/gm2/pimlib/logitech/run/pass/pimlib-logitech-run-pass.exp +++ b/gcc/testsuite/gm2/pimlib/logitech/run/pass/pimlib-logitech-run-pass.exp @@ -27,10 +27,8 @@ load_lib gm2-torture.exp set gm2src ${srcdir}/../m2 -gm2_link_lib "m2log m2pim m2iso" gm2_init_log - foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $testcase] then { diff --git a/gcc/testsuite/gm2/pimlib/run/pass/pimlib-run-pass.exp b/gcc/testsuite/gm2/pimlib/run/pass/pimlib-run-pass.exp index 99fdb71..cfe9ff8 100644 --- a/gcc/testsuite/gm2/pimlib/run/pass/pimlib-run-pass.exp +++ b/gcc/testsuite/gm2/pimlib/run/pass/pimlib-run-pass.exp @@ -27,10 +27,8 @@ load_lib gm2-torture.exp set gm2src ${srcdir}/../m2 -gm2_link_lib "m2pim m2log m2iso" gm2_init_log - foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $testcase] then { diff --git a/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp b/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp index 8cb19a1..b943798 100644 --- a/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp +++ b/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp @@ -27,7 +27,6 @@ load_lib gm2-torture.exp set gm2src ${srcdir}/../m2 -gm2_link_lib "m2iso m2pim" gm2_init_iso foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { diff --git a/gcc/testsuite/gm2/projects/iso/run/pass/hello/projects-iso-run-pass-hello.exp b/gcc/testsuite/gm2/projects/iso/run/pass/hello/projects-iso-run-pass-hello.exp index 8cb19a1..b943798 100644 --- a/gcc/testsuite/gm2/projects/iso/run/pass/hello/projects-iso-run-pass-hello.exp +++ b/gcc/testsuite/gm2/projects/iso/run/pass/hello/projects-iso-run-pass-hello.exp @@ -27,7 +27,6 @@ load_lib gm2-torture.exp set gm2src ${srcdir}/../m2 -gm2_link_lib "m2iso m2pim" gm2_init_iso foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { diff --git a/gcc/testsuite/gm2/projects/pim/run/pass/hello/projects-pim-run-pass-hello.exp b/gcc/testsuite/gm2/projects/pim/run/pass/hello/projects-pim-run-pass-hello.exp index 1c46f81..0737b90 100644 --- a/gcc/testsuite/gm2/projects/pim/run/pass/hello/projects-pim-run-pass-hello.exp +++ b/gcc/testsuite/gm2/projects/pim/run/pass/hello/projects-pim-run-pass-hello.exp @@ -27,7 +27,6 @@ load_lib gm2-torture.exp set gm2src ${srcdir}/../m2 -gm2_link_lib "m2pim m2log m2iso" gm2_init_pim foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { diff --git a/gcc/testsuite/gm2/projects/pim/run/pass/random/projects-pim-run-pass-random.exp b/gcc/testsuite/gm2/projects/pim/run/pass/random/projects-pim-run-pass-random.exp index 5ae14ec..012caa6 100644 --- a/gcc/testsuite/gm2/projects/pim/run/pass/random/projects-pim-run-pass-random.exp +++ b/gcc/testsuite/gm2/projects/pim/run/pass/random/projects-pim-run-pass-random.exp @@ -25,27 +25,26 @@ if $tracelevel then { # load support procs load_lib gm2-torture.exp -set gm2src ${srcdir}/../m2 - -gm2_link_lib "m2pim m2log m2iso" -gm2_init_pim "-g -I$srcdir/$subdir" +gm2_init_pim "$srcdir/$subdir" -g gm2_link_obj "WriteMap.o AdvMap.o BoxMap.o Chance.o Geometry.o MakeBoxes.o MapOptions.o Options.o RoomMap.o StoreCoords.o" +# If we want these to be re-built for each torture option we need some different +# logic. +gm2_target_compile $srcdir/$subdir/AdvMap.mod AdvMap.o object "-g -I$srcdir/$subdir/" +gm2_target_compile $srcdir/$subdir/BoxMap.mod BoxMap.o object "-g -I$srcdir/$subdir/" +gm2_target_compile $srcdir/$subdir/Chance.mod Chance.o object "-g -I$srcdir/$subdir/" +gm2_target_compile $srcdir/$subdir/Geometry.mod Geometry.o object "-g -I$srcdir/$subdir/" +gm2_target_compile $srcdir/$subdir/MakeBoxes.mod MakeBoxes.o object "-g -I$srcdir/$subdir/" +gm2_target_compile $srcdir/$subdir/MapOptions.mod MapOptions.o object "-g -I$srcdir/$subdir/" +gm2_target_compile $srcdir/$subdir/Options.mod Options.o object "-g -I$srcdir/$subdir/" +gm2_target_compile $srcdir/$subdir/RoomMap.mod RoomMap.o object "-g -I$srcdir/$subdir/" +gm2_target_compile $srcdir/$subdir/StoreCoords.mod StoreCoords.o object "-g -I$srcdir/$subdir/" +gm2_target_compile $srcdir/$subdir/WriteMap.mod WriteMap.o object "-g -I$srcdir/$subdir/" + foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/Map.mod]] { # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $testcase] then { continue } - - gm2_target_compile $srcdir/$subdir/AdvMap.mod AdvMap.o object "-g -I$srcdir/$subdir/" - gm2_target_compile $srcdir/$subdir/BoxMap.mod BoxMap.o object "-g -I$srcdir/$subdir/" - gm2_target_compile $srcdir/$subdir/Chance.mod Chance.o object "-g -I$srcdir/$subdir/" - gm2_target_compile $srcdir/$subdir/Geometry.mod Geometry.o object "-g -I$srcdir/$subdir/" - gm2_target_compile $srcdir/$subdir/MakeBoxes.mod MakeBoxes.o object "-g -I$srcdir/$subdir/" - gm2_target_compile $srcdir/$subdir/MapOptions.mod MapOptions.o object "-g -I$srcdir/$subdir/" - gm2_target_compile $srcdir/$subdir/Options.mod Options.o object "-g -I$srcdir/$subdir/" - gm2_target_compile $srcdir/$subdir/RoomMap.mod RoomMap.o object "-g -I$srcdir/$subdir/" - gm2_target_compile $srcdir/$subdir/StoreCoords.mod StoreCoords.o object "-g -I$srcdir/$subdir/" - gm2_target_compile $srcdir/$subdir/WriteMap.mod WriteMap.o object "-g -I$srcdir/$subdir/" gm2-torture-execute $testcase "" "pass" } diff --git a/gcc/testsuite/gm2/sets/run/pass/sets-run-pass.exp b/gcc/testsuite/gm2/sets/run/pass/sets-run-pass.exp index d0cb7b0..a439526 100644 --- a/gcc/testsuite/gm2/sets/run/pass/sets-run-pass.exp +++ b/gcc/testsuite/gm2/sets/run/pass/sets-run-pass.exp @@ -27,7 +27,6 @@ load_lib gm2-torture.exp set gm2src ${srcdir}/../m2 -gm2_link_lib "m2iso m2pim" gm2_init_iso "${srcdir}/gm2/sets/run/pass/" foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { diff --git a/gcc/testsuite/gm2/switches/none/run/pass/gm2-none.exp b/gcc/testsuite/gm2/switches/none/run/pass/gm2-none.exp index 747c474..cf77d5a 100644 --- a/gcc/testsuite/gm2/switches/none/run/pass/gm2-none.exp +++ b/gcc/testsuite/gm2/switches/none/run/pass/gm2-none.exp @@ -26,7 +26,6 @@ load_lib gm2-simple.exp set gm2src ${srcdir}/../m2 -gm2_link_lib "m2pim m2iso" gm2_init_pim foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { diff --git a/gcc/testsuite/gm2/switches/pic/run/pass/switches-pic-run-pass.exp b/gcc/testsuite/gm2/switches/pic/run/pass/switches-pic-run-pass.exp index a2af765..67ee502 100644 --- a/gcc/testsuite/gm2/switches/pic/run/pass/switches-pic-run-pass.exp +++ b/gcc/testsuite/gm2/switches/pic/run/pass/switches-pic-run-pass.exp @@ -26,10 +26,8 @@ load_lib gm2-torture.exp set gm2src ${srcdir}/../m2 -gm2_link_lib "m2pim m2iso" gm2_init_pim "${srcdir}/gm2/switches/pic/run/pass" -fPIC - foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $testcase] then { diff --git a/gcc/testsuite/lib/gm2.exp b/gcc/testsuite/lib/gm2.exp index 1e93d6a..41a2fa0 100644 --- a/gcc/testsuite/lib/gm2.exp +++ b/gcc/testsuite/lib/gm2.exp @@ -352,6 +352,7 @@ proc gm2_init_pimx { dialect {path ""} args } { append theIpath " -I" append theIpath ${path} } + gm2_link_lib "m2pim m2iso" gm2_init {*}${theIpath} {*}${dialect} {*}${theLpath} {*}${args}; } @@ -422,6 +423,7 @@ proc gm2_init_iso { {path ""} args } { append theIpath ${path} } + gm2_link_lib "m2iso m2pim m2cor" gm2_init {*}${theIpath} -fiso {*}${theLpath} {*}${args}; } @@ -450,6 +452,7 @@ proc gm2_init_ulm { {path ""} args } { append theIpath ${path} } + gm2_link_lib "m2ulm m2pim" gm2_init {*}${theIpath} -fpim {*}${theLpath} {*}${args}; } @@ -540,24 +543,26 @@ proc gm2_init_cor { {path ""} args } { proc gm2_init_minx { dialect {path ""} args } { global srcdir; global gccpath; - set gm2src ${srcdir}/../m2; send_log "srcdir is $srcdir\n" send_log "gccpath is $gccpath\n" send_log "gm2src is $gm2src\n" - set minIpath "${gccpath}/libgm2/libm2min"; - set minLpath "${gccpath}/libgm2/libm2min/.libs"; + set theIpath " -I${gccpath}/libgm2/libm2min" + append theIpath " -I${gm2src}/gm2-libs-min" - set theIpath "-I${minIpath}"; - set theLpath "-L${minLpath}"; + set theLpath " -L${gccpath}/libgm2/libm2min/.libs"; if { $path != "" } then { append theIpath " -I" append theIpath ${path} } - gm2_init {*}${theIpath} {*}${dialect} {*}${theLpath} {*}${args}; + + gm2_link_lib "m2min" + append args " -fno-exceptions " + append args " -fno-libs=- " + gm2_init {*}${theIpath} {*}${dialect} {*}${theLpath} {*}${args} } # @@ -566,6 +571,5 @@ proc gm2_init_minx { dialect {path ""} args } { # proc gm2_init_min { {path ""} args } { - append args " -fno-exceptions" - gm2_init_minx -fpim {*}${path} {*}${args}; + gm2_init_minx -fpim {*}${path} {*}${args} } |