From patchwork Fri Nov 19 12:21:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 72244 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 47FA31007D2 for ; Fri, 19 Nov 2010 23:21:29 +1100 (EST) Received: (qmail 14646 invoked by alias); 19 Nov 2010 12:21:23 -0000 Received: (qmail 14626 invoked by uid 22791); 19 Nov 2010 12:21:21 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, TW_IB, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 19 Nov 2010 12:21:15 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id E828C229; Fri, 19 Nov 2010 13:21:12 +0100 (CET) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id HYTbI6Ax6+gO; Fri, 19 Nov 2010 13:21:11 +0100 (CET) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id E2FE2227; Fri, 19 Nov 2010 13:21:10 +0100 (CET) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.4+Sun/8.14.4/Submit) id oAJCLAZD007120; Fri, 19 Nov 2010 13:21:10 +0100 (MET) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: fortran@gcc.gnu.org Subject: [fortran, build] Fix libquadmath build on Solaris 2 Date: Fri, 19 Nov 2010 13:21:10 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org 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 * 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)