This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[fortran, build] Fix libquadmath build on Solaris 2
- From: Rainer Orth <ro at CeBiTec dot Uni-Bielefeld dot DE>
- To: gcc-patches at gcc dot gnu dot org
- Cc: fortran at gcc dot gnu dot org
- Date: Fri, 19 Nov 2010 13:21:10 +0100
- Subject: [fortran, build] Fix libquadmath build on Solaris 2
As discussed in this thread
http://gcc.gnu.org/ml/gcc/2010-11/msg00422.html
the following patch restores Solaris 2 bootstrap in libquadmath. It was
created with diff -wup to avoid obscuring it by the whitespace
differences.
Successfully bootstrapped on i386-pc-solaris2.10, though all 64-bit
Fortran execution tests still fail as described above.
For the time being, I'm moving -lm from _LIBADD to _LDFLAGS, as is
already done in libjava/Makefile.am. Depending on the outcome of
further discussions, this might be handled in contrib/make_sunver.pl in
the future.
Installed.
Rainer
2010-11-18 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* Makefile.am (libquadmath_la_LIBADD): Move -lm ...
(libquadmath_la_LDFLAGS): ... here.
(quadmath.map-sun): Tabify.
Fix sed expression.
* Makefile.in: Regenerate.
--- local.9fa5269f2518/libquadmath/Makefile.am 2010-11-19 13:15:10.802866291 +0100
+++ /vol/gcc/src/hg/trunk/local/libquadmath/Makefile.am 2010-11-18 18:29:42.000000000 +0100
@@ -24,9 +24,8 @@ quadmath.map-sun : $(srcdir)/quadmath.ma
$(libquadmath_la_OBJECTS) $(libquadmath_la_LIBADD)
perl $(top_srcdir)/../contrib/make_sunver.pl \
$(srcdir)/quadmath.map \
- $(libquadmath_la_OBJECTS:%.lo=.libs/%.o) \
- `echo $(libquadmath_la_LIBADD) | \
- sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \
+ `echo $(libquadmath_la_OBJECTS) $(libquadmath_la_LIBADD) | \
+ sed 's,\([^/ ]*\)\.l\([ao]\),.libs/\1.\2,g'` \
> $@ || (rm -f $@ ; exit 1)
endif
else
@@ -39,8 +38,8 @@ LTLDFLAGS = $(shell $(SHELL) $(top_srcdi
toolexeclib_LTLIBRARIES = libquadmath.la
-libquadmath_la_LIBADD = -lm
-libquadmath_la_LDFLAGS = $(LTLDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(version_arg)
+libquadmath_la_LIBADD =
+libquadmath_la_LDFLAGS = $(LTLDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(version_arg) -lm
libquadmath_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS)
libquadmath_la_DEPENDENCIES = $(version_dep)
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University