From patchwork Tue Jul 20 09:45:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikael Pettersson X-Patchwork-Id: 59292 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 53CF5B6EF2 for ; Tue, 20 Jul 2010 19:45:32 +1000 (EST) Received: (qmail 3654 invoked by alias); 20 Jul 2010 09:45:30 -0000 Received: (qmail 3643 invoked by uid 22791); 20 Jul 2010 09:45:29 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, TW_SV, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from fanny.its.uu.se (HELO fanny.its.uu.se) (130.238.4.241) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 20 Jul 2010 09:45:24 +0000 Received: by fanny.its.uu.se (Postfix, from userid 212) id 453C563C1; Tue, 20 Jul 2010 11:45:22 +0200 (MSZ) Received: from fanny.its.uu.se(127.0.0.1) by fanny.its.uu.se via virus-scan id s24841; Tue, 20 Jul 10 11:45:17 +0200 Received: from pilspetsen.it.uu.se (pilspetsen.it.uu.se [130.238.18.39]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by fanny.its.uu.se (Postfix) with ESMTP id 5BBC262C3 for ; Tue, 20 Jul 2010 11:45:17 +0200 (MSZ) Received: (from mikpe@localhost) by pilspetsen.it.uu.se (8.13.8+Sun/8.13.8) id o6K9jHXo014244; Tue, 20 Jul 2010 11:45:17 +0200 (MEST) MIME-Version: 1.0 Message-ID: <19525.28716.954793.167164@pilspetsen.it.uu.se> Date: Tue, 20 Jul 2010 11:45:16 +0200 From: Mikael Pettersson To: gcc-patches@gcc.gnu.org Subject: [RESEND][PATCH, libstdc++] unwind-cxx.h: correct prototypes for ARM EH routines (PR libstdc++/44902) 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 (Resend, mistakenly cc:d gcc@ not gcc-patches@.) The prototypes for two ARM EH routines don't match their actual definitions in eh_arm.cc, resulting in build-time warnings. When -Werror is active, the build fails. See PR44902. Fixed simply by updating the prototypes to match the definitions. Tested with crosses to arm-eabi and arm-linux-gnueabi, and with a native bootstrap and regtest on arm-linux-gnueabi. Ok for 4.6? (I don't have svn write access.) libstdc++-v3/ 2010-07-20 Mikael Pettersson PR libstdc++/44902 * libsupc++/unwind-cxx.h (__cxa_type_match): Correct prototype. (__cxa_begin_cleanup): Likewise. --- gcc-4.6-20100717/libstdc++-v3/libsupc++/unwind-cxx.h.~1~ 2009-05-03 18:51:50.000000000 +0200 +++ gcc-4.6-20100717/libstdc++-v3/libsupc++/unwind-cxx.h 2010-07-20 11:18:42.000000000 +0200 @@ -196,9 +196,9 @@ typedef enum { ctm_succeeded = 1, ctm_succeeded_with_ptr_to_base = 2 } __cxa_type_match_result; -extern "C" bool __cxa_type_match(_Unwind_Exception*, const std::type_info*, - bool, void**); -extern "C" void __cxa_begin_cleanup (_Unwind_Exception*); +extern "C" __cxa_type_match_result __cxa_type_match(_Unwind_Exception*, const std::type_info*, + bool, void**); +extern "C" bool __cxa_begin_cleanup (_Unwind_Exception*); extern "C" void __cxa_end_cleanup (void); #endif