From owner-svn-src-stable@FreeBSD.ORG  Thu Jul  4 22:09:14 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E1FAFC9F;
 Thu,  4 Jul 2013 22:09:14 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D302C1170;
 Thu,  4 Jul 2013 22:09:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r64M9EbQ062867;
 Thu, 4 Jul 2013 22:09:14 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r64M9EbD062866;
 Thu, 4 Jul 2013 22:09:14 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201307042209.r64M9EbD062866@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 4 Jul 2013 22:09:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252731 - in stable: 7/contrib/libstdc++/libsupc++
 8/contrib/libstdc++/libsupc++ 9/contrib/libstdc++/libsupc++
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Jul 2013 22:09:15 -0000

Author: dim
Date: Thu Jul  4 22:09:14 2013
New Revision: 252731
URL: http://svnweb.freebsd.org/changeset/base/252731

Log:
  MFC r252387:
  
  Make libsupc++'s __cxa_call_terminate() prototype consistent with the
  definition.
  
  Submitted by:	dt71@gmx.com

Modified:
  stable/9/contrib/libstdc++/libsupc++/unwind-cxx.h
Directory Properties:
  stable/9/contrib/libstdc++/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/7/contrib/libstdc++/libsupc++/unwind-cxx.h
  stable/8/contrib/libstdc++/libsupc++/unwind-cxx.h
Directory Properties:
  stable/7/contrib/libstdc++/   (props changed)
  stable/8/contrib/libstdc++/   (props changed)

Modified: stable/9/contrib/libstdc++/libsupc++/unwind-cxx.h
==============================================================================
--- stable/9/contrib/libstdc++/libsupc++/unwind-cxx.h	Thu Jul  4 21:57:09 2013	(r252730)
+++ stable/9/contrib/libstdc++/libsupc++/unwind-cxx.h	Thu Jul  4 22:09:14 2013	(r252731)
@@ -133,7 +133,7 @@ extern "C" void __cxa_bad_typeid ();
 // throws, and if bad_exception needs to be thrown.  Called from the
 // compiler.
 extern "C" void __cxa_call_unexpected (void *) __attribute__((noreturn));
-extern "C" void __cxa_call_terminate (void*) __attribute__((noreturn));
+extern "C" void __cxa_call_terminate (_Unwind_Exception*) __attribute__((noreturn));
 
 #ifdef __ARM_EABI_UNWINDER__
 // Arm EABI specified routines.