[Patch, libgfortran] PR24909 libmatmul.la breaks Darwin build

[Janne Blomqvist]

Hi,

a small bugfix to the patch is attached.

But anyway, there seems to be linking problems on Solaris in addition
to build problems on Darwin, so perhaps we should wait if someone with
access to those platforms comes up with some solution. Otherwise I
think we must back out this -ftree-vectorize thing for matmul before
4.1 releases.



-- 
Janne Blomqvist
-------------- next part --------------
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 107213)
+++ Makefile.am	(working copy)
@@ -573,16 +573,16 @@ $(gfor_built_specific2_src) \
 intrinsics/dprod_r8.f90 \
 intrinsics/f2c_specifics.F90
 
-EXTRA_LTLIBRARIES = libmatmul.la
-libmatmul_la_SOURCES = $(i_matmul_c)
-libmatmul_la_CFLAGS = -ftree-vectorize $(AM_CFLAGS)
+noinst_LTLIBRARIES = libmatmul_convenience.la
+libmatmul_convenience_la_SOURCES = $(i_matmul_c)
+libmatmul_convenience_la_CFLAGS = -ftree-vectorize $(AM_CFLAGS)
 
 BUILT_SOURCES=$(gfor_built_src) $(gfor_built_specific_src) \
-    $(gfor_built_specific2_src) $(libmatmul_la_SOURCES)
+    $(gfor_built_specific2_src) $(i_matmul_c)
 libgfortran_la_SOURCES = $(gfor_src) $(gfor_built_src) $(gfor_io_src) \
     $(gfor_helper_src) $(gfor_io_headers) $(gfor_specific_src)
 
-libgfortran_la_LIBADD =  libmatmul.la
+libgfortran_la_LIBADD =  libmatmul_convenience.la
 
 I_M4_DEPS=m4/iparm.m4
 I_M4_DEPS0=$(I_M4_DEPS) m4/iforeach.m4
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 185 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/fortran/attachments/20051119/b7af1179/attachment.sig>