From patchwork Wed Feb 16 13:51:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 83366 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 6C600B70A3 for ; Thu, 17 Feb 2011 00:52:07 +1100 (EST) Received: (qmail 14769 invoked by alias); 16 Feb 2011 13:52:04 -0000 Received: (qmail 14753 invoked by uid 22791); 16 Feb 2011 13:52:02 -0000 X-SWARE-Spam-Status: No, hits=-6.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 16 Feb 2011 13:51:57 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p1GDpuK8008090 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 16 Feb 2011 08:51:56 -0500 Received: from tyan-ft48-01.lab.bos.redhat.com (tyan-ft48-01.lab.bos.redhat.com [10.16.42.4]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p1GDpt0p007685 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 16 Feb 2011 08:51:56 -0500 Received: from tyan-ft48-01.lab.bos.redhat.com (localhost.localdomain [127.0.0.1]) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4) with ESMTP id p1GDpt6O011447; Wed, 16 Feb 2011 14:51:55 +0100 Received: (from jakub@localhost) by tyan-ft48-01.lab.bos.redhat.com (8.14.4/8.14.4/Submit) id p1GDpstL011445; Wed, 16 Feb 2011 14:51:54 +0100 Date: Wed, 16 Feb 2011 14:51:54 +0100 From: Jakub Jelinek To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] Add some forgotten exports to libgfortran/gfortran.map (PR libfortran/47757) Message-ID: <20110216135154.GV30899@tyan-ft48-01.lab.bos.redhat.com> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) 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 Hi! As the testcases below show, some exports from libgfortran.so were forgotten on targets with symbol versioning. This patch fixes it, bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? 2011-02-16 Jakub Jelinek PR libfortran/47757 * libgfortran/gfortran.map (GFORTRAN_1.4): Export _gfortran_{m,s}i{all,any,parity}_i{1,2,4,8,16} and _gfortran_{cshift0,eoshift{0,2}}_16_char4. * gfortran.dg/pr47757-1.f90: New test. * gfortran.dg/pr47757-2.f90: New test. * gfortran.dg/pr47757-3.f90: New test. Jakub --- libgfortran/gfortran.map.jj 2010-11-17 10:13:20.000000000 +0100 +++ libgfortran/gfortran.map 2011-02-16 10:54:46.979897353 +0100 @@ -1122,16 +1122,46 @@ GFORTRAN_1.4 { _gfortran_iall_i4; _gfortran_iall_i8; _gfortran_iall_i16; + _gfortran_miall_i1; + _gfortran_miall_i2; + _gfortran_miall_i4; + _gfortran_miall_i8; + _gfortran_miall_i16; + _gfortran_siall_i1; + _gfortran_siall_i2; + _gfortran_siall_i4; + _gfortran_siall_i8; + _gfortran_siall_i16; _gfortran_iany_i1; _gfortran_iany_i2; _gfortran_iany_i4; _gfortran_iany_i8; _gfortran_iany_i16; + _gfortran_miany_i1; + _gfortran_miany_i2; + _gfortran_miany_i4; + _gfortran_miany_i8; + _gfortran_miany_i16; + _gfortran_siany_i1; + _gfortran_siany_i2; + _gfortran_siany_i4; + _gfortran_siany_i8; + _gfortran_siany_i16; _gfortran_iparity_i1; _gfortran_iparity_i2; _gfortran_iparity_i4; _gfortran_iparity_i8; _gfortran_iparity_i16; + _gfortran_miparity_i1; + _gfortran_miparity_i2; + _gfortran_miparity_i4; + _gfortran_miparity_i8; + _gfortran_miparity_i16; + _gfortran_siparity_i1; + _gfortran_siparity_i2; + _gfortran_siparity_i4; + _gfortran_siparity_i8; + _gfortran_siparity_i16; _gfortran_norm2_r4; _gfortran_norm2_r8; _gfortran_norm2_r10; @@ -1154,6 +1184,9 @@ GFORTRAN_1.4 { _gfortran_transfer_real_write; _gfortran_transfer_real128; _gfortran_transfer_real128_write; + _gfortran_cshift0_16_char4; + _gfortran_eoshift0_16_char4; + _gfortran_eoshift2_16_char4; } GFORTRAN_1.3; F2C_1.0 { --- gcc/testsuite/gfortran.dg/pr47757-1.f90.jj 2011-02-16 10:32:59.273764520 +0100 +++ gcc/testsuite/gfortran.dg/pr47757-1.f90 2011-02-16 10:35:12.370402168 +0100 @@ -0,0 +1,40 @@ +! PR libfortran/47757 +! { dg-do run } + + integer(1) :: a1(2,2) + integer(2) :: a2(2,2) + integer(4) :: a4(2,2) + integer(8) :: a8(2,2) + logical :: mask(2,2) + logical :: mask2 + a1 = 0 + a2 = 0 + a3 = 0 + a4 = 0 + mask2 = .true. + mask = reshape([.true.,.true.,.false.,.true.],[2,2]) + print *, iany(a1, dim=1, mask=mask) + print *, iany(a2, dim=1, mask=mask) + print *, iany(a4, dim=1, mask=mask) + print *, iany(a8, dim=1, mask=mask) + print *, iall(a1, dim=1, mask=mask) + print *, iall(a2, dim=1, mask=mask) + print *, iall(a4, dim=1, mask=mask) + print *, iall(a8, dim=1, mask=mask) + print *, iparity(a1, dim=1, mask=mask) + print *, iparity(a2, dim=1, mask=mask) + print *, iparity(a4, dim=1, mask=mask) + print *, iparity(a8, dim=1, mask=mask) + print *, iany(a1, dim=1, mask=mask2) + print *, iany(a2, dim=1, mask=mask2) + print *, iany(a4, dim=1, mask=mask2) + print *, iany(a8, dim=1, mask=mask2) + print *, iall(a1, dim=1, mask=mask2) + print *, iall(a2, dim=1, mask=mask2) + print *, iall(a4, dim=1, mask=mask2) + print *, iall(a8, dim=1, mask=mask2) + print *, iparity(a1, dim=1, mask=mask2) + print *, iparity(a2, dim=1, mask=mask2) + print *, iparity(a4, dim=1, mask=mask2) + print *, iparity(a8, dim=1, mask=mask2) +end --- gcc/testsuite/gfortran.dg/pr47757-2.f90.jj 2011-02-16 10:33:09.269420078 +0100 +++ gcc/testsuite/gfortran.dg/pr47757-2.f90 2011-02-16 10:50:30.057714582 +0100 @@ -0,0 +1,16 @@ +! PR libfortran/47757 +! { dg-do run { target fortran_large_int } } + + integer(16) :: a16(2,2) + logical :: mask(2,2) + logical :: mask2 + a16 = 0 + mask2 = .true. + mask = reshape([.true.,.true.,.false.,.true.],[2,2]) + print *, iany(a16, dim=1, mask=mask) + print *, iall(a16, dim=1, mask=mask) + print *, iparity(a16, dim=1, mask=mask) + print *, iany(a16, dim=1, mask=mask2) + print *, iall(a16, dim=1, mask=mask2) + print *, iparity(a16, dim=1, mask=mask2) +end --- gcc/testsuite/gfortran.dg/pr47757-3.f90.jj 2011-02-16 10:35:25.864388810 +0100 +++ gcc/testsuite/gfortran.dg/pr47757-3.f90 2011-02-16 10:50:41.550388829 +0100 @@ -0,0 +1,12 @@ +! PR libfortran/47757 +! { dg-do run { target fortran_large_int } } + + character(kind=4):: str(3,3), s(3) + str(1,:) = [4_'A', 4_'b', 4_'C'] + str(2,:) = [4_'A', 4_'b', 4_'C'] + str(3,:) = [4_'A', 4_'b', 4_'C'] + s = 4_'A' + print *, cshift(str, shift=2_16, dim=1_16) + print *, eoshift(str, shift=2_16, dim=1_16) + print *, eoshift(str, shift=2_16, boundary=s, dim=1_16) +end