diff options
| author | Iain Sandoe <iain.sandoe@sandoe-acoustics.co.uk> | 2009-01-20 00:59:24 +0000 |
|---|---|---|
| committer | Janis Johnson <janis@gcc.gnu.org> | 2009-01-20 00:59:24 +0000 |
| commit | 72c665969348d8e57ca8b4f39f7fffbc5f0a0d46 (patch) | |
| tree | 0fe05fe529d09ee5c6892cc3701dbd37a3326bca | |
| parent | 6600206c4efd31e1a6034cab809c51d72a694163 (diff) | |
| download | gcc-72c665969348d8e57ca8b4f39f7fffbc5f0a0d46.zip gcc-72c665969348d8e57ca8b4f39f7fffbc5f0a0d46.tar.gz gcc-72c665969348d8e57ca8b4f39f7fffbc5f0a0d46.tar.bz2 | |
darwin.h: Add static-libgfortran to LINK_SPEC.
2009-01-19 Iain Sandoe <iain.sandoe@sandoe-acoustics.co.uk>
gcc/
* config/darwin.h: Add static-libgfortran to LINK_SPEC.
gcc/testsuite/
* lib/gfortran.exp: Add -B options for targets that use
libgfortran.a%s in their specs.
libgomp/
* testsuite/lib/libgomp.exp: Add -B option for targets that
use libgfortran.a%s in their specs.
From-SVN: r143507
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/config/darwin.h | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gfortran.exp | 3 | ||||
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/testsuite/lib/libgomp.exp | 3 |
6 files changed, 21 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c36c612..b1b7fe7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2009-01-19 Iain Sandoe <iain.sandoe@sandoe-acoustics.co.uk> + + * config/darwin.h: Add static-libgfortran to LINK_SPEC. + 2009-01-19 Vladimir Makarov <vmakarov@redhat.com> PR c/38869 diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index 03955c6..53dab64 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -258,6 +258,7 @@ extern GTY(()) int darwin_ms_struct; #define LINK_SPEC \ "%{static}%{!static:-dynamic} \ %{fgnu-runtime:%:replace-outfile(-lobjc -lobjc-gnu)}\ + %{static|static-libgfortran:%:replace-outfile(-lgfortran libgfortran.a%s)}\ %{!Zdynamiclib: \ %{Zforce_cpusubtype_ALL:-arch %(darwin_arch) -force_cpusubtype_ALL} \ %{!Zforce_cpusubtype_ALL:-arch %(darwin_subarch)} \ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e9bfcd2..24d647ee 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-01-19 Iain Sandoe <iain.sandoe@sandoe-acoustics.co.uk> + + * lib/gfortran.exp: Add -B options for targets that use + libgfortran.a%s in their specs. + 2009-01-19 Jason Merrill <jason@redhat.com> PR c++/23287 diff --git a/gcc/testsuite/lib/gfortran.exp b/gcc/testsuite/lib/gfortran.exp index b0e66d8..6d5617f 100644 --- a/gcc/testsuite/lib/gfortran.exp +++ b/gcc/testsuite/lib/gfortran.exp @@ -88,6 +88,9 @@ proc gfortran_link_flags { paths } { if { $gccpath != "" } { if [file exists "${gccpath}/libgfortran/.libs/libgfortran.a"] { + # Some targets use libgfortran.a%s in their specs, so they need a -B option + # for uninstalled testing. + append flags "-B${gccpath}/libgfortran/.libs " append flags "-L${gccpath}/libgfortran/.libs " append ld_library_path ":${gccpath}/libgfortran/.libs" } diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 9428394..d23a233 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2009-01-19 Iain Sandoe <iain.sandoe@sandoe-acoustics.co.uk> + + * testsuite/lib/libgomp.exp: Add -B option for targets that + use libgfortran.a%s in their specs. + 2009-01-07 Jakub Jelinek <jakub@redhat.com> PR libgomp/38086 diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 4e2600e..972d4a1 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -171,6 +171,9 @@ proc libgomp_target_compile { source dest type options } { if { [info exists lang_test_file] } { if { $blddir != "" } { + # Some targets use libgfortran.a%s in their specs, so they need + # a -B option for uninstalled testing. + lappend options "additional_flags=-B${blddir}/${lang_library_path}" lappend options "ldflags=-L${blddir}/${lang_library_path}" } lappend options "ldflags=${lang_link_flags}" |