From owner-svn-src-head@FreeBSD.ORG  Tue Jul 22 20:32:25 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 01D5E7A8;
 Tue, 22 Jul 2014 20:32:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E1C852321;
 Tue, 22 Jul 2014 20:32:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6MKWOoh088287;
 Tue, 22 Jul 2014 20:32:24 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6MKWOd7088286;
 Tue, 22 Jul 2014 20:32:24 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201407222032.s6MKWOd7088286@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Tue, 22 Jul 2014 20:32:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268993 - head/contrib/libstdc++/libsupc++
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jul 2014 20:32:25 -0000

Author: ian
Date: Tue Jul 22 20:32:24 2014
New Revision: 268993
URL: http://svnweb.freebsd.org/changeset/base/268993

Log:
  Fix EABI unwind function declarations to match the function definitions.
  The mismatch was noticed by clang, when using it to compile the in-tree
  gcc and libstdc++.

Modified:
  head/contrib/libstdc++/libsupc++/unwind-cxx.h

Modified: head/contrib/libstdc++/libsupc++/unwind-cxx.h
==============================================================================
--- head/contrib/libstdc++/libsupc++/unwind-cxx.h	Tue Jul 22 20:13:46 2014	(r268992)
+++ head/contrib/libstdc++/libsupc++/unwind-cxx.h	Tue Jul 22 20:32:24 2014	(r268993)
@@ -142,9 +142,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*,
+extern "C" __cxa_type_match_result __cxa_type_match(_Unwind_Exception*, const std::type_info*,
 				 bool, void**);
-extern "C" void __cxa_begin_cleanup (_Unwind_Exception*);
+extern "C" bool __cxa_begin_cleanup (_Unwind_Exception*);
 extern "C" void __cxa_end_cleanup (void);
 #endif