OSDN Git Service

2005-11-11 Andreas Tobler <a.tobler@schweiz.ch>
authorandreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 11 Nov 2005 21:41:55 +0000 (21:41 +0000)
committerandreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 11 Nov 2005 21:41:55 +0000 (21:41 +0000)
* gfortran.dg/static_linking_1.f: Fix static_libgfortran processing.

* lib/target-supports.exp (check_effective_target_static_libgfortran):
Add -static to additional_flags and pass it to target_compile.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@106800 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/testsuite/ChangeLog
gcc/testsuite/gfortran.dg/static_linking_1.f
gcc/testsuite/lib/target-supports.exp

index a807562..03be1ca 100644 (file)
@@ -1,3 +1,10 @@
+2005-11-11  Andreas Tobler  <a.tobler@schweiz.ch>
+
+       * gfortran.dg/static_linking_1.f: Fix static_libgfortran processing.
+
+       * lib/target-supports.exp (check_effective_target_static_libgfortran):
+       Add -static to additional_flags and pass it to target_compile.
+
 2005-11-11  Jerry DeLisle <jvdelisle@gcc.gnu.org>
 
        PR libgfortran/24719
 2005-11-11  Jerry DeLisle <jvdelisle@gcc.gnu.org>
 
        PR libgfortran/24719
index 5107a07..099f4d4 100644 (file)
@@ -1,5 +1,5 @@
-! { dg-require-effective-target static_libgfortran }
 ! { dg-do run }
 ! { dg-do run }
+! { dg-require-effective-target static_libgfortran }
 ! { dg-additional-sources static_linking_1.c }
 ! { dg-options "-static" }
 !
 ! { dg-additional-sources static_linking_1.c }
 ! { dg-options "-static" }
 !
index 38eb91a..5b770dc 100644 (file)
@@ -634,8 +634,9 @@ proc check_effective_target_static_libgfortran { } {
        # Set up, compile, and execute a test program using static linking.
        # Include the current process ID in the file names to prevent
        # conflicts with invocations for multiple testsuites.
        # Set up, compile, and execute a test program using static linking.
        # Include the current process ID in the file names to prevent
        # conflicts with invocations for multiple testsuites.
+       set opts "additional_flags=-static"
        set src static[pid].f
        set src static[pid].f
-        set exe static[pid].x
+       set exe static[pid].x
 
        set f [open $src "w"]
        puts $f "      print *, 'test'"
 
        set f [open $src "w"]
        puts $f "      print *, 'test'"
@@ -643,7 +644,7 @@ proc check_effective_target_static_libgfortran { } {
        close $f
 
        verbose "check_effective_target_static_libgfortran compiling testfile $src" 2
        close $f
 
        verbose "check_effective_target_static_libgfortran compiling testfile $src" 2
-       set lines [${tool}_target_compile $src $exe executable "-static"]
+       set lines [${tool}_target_compile $src $exe executable "$opts"]
        file delete $src
 
        if [string match "" $lines] then {
        file delete $src
 
        if [string match "" $lines] then {