From patchwork Mon Jul 11 20:16:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 104281 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 EF044B6F7E for ; Tue, 12 Jul 2011 06:16:27 +1000 (EST) Received: (qmail 18803 invoked by alias); 11 Jul 2011 20:16:25 -0000 Received: (qmail 18795 invoked by uid 22791); 11 Jul 2011 20:16:24 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 11 Jul 2011 20:16:09 +0000 Received: from kpbe17.cbf.corp.google.com (kpbe17.cbf.corp.google.com [172.25.105.81]) by smtp-out.google.com with ESMTP id p6BKG8vV018849 for ; Mon, 11 Jul 2011 13:16:08 -0700 Received: from iwg8 (iwg8.prod.google.com [10.241.66.136]) by kpbe17.cbf.corp.google.com with ESMTP id p6BKFaXs021190 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for ; Mon, 11 Jul 2011 13:16:07 -0700 Received: by iwg8 with SMTP id 8so4990220iwg.24 for ; Mon, 11 Jul 2011 13:16:07 -0700 (PDT) Received: by 10.231.114.92 with SMTP id d28mr4657111ibq.167.1310415366964; Mon, 11 Jul 2011 13:16:06 -0700 (PDT) Received: from coign.google.com ([216.239.45.130]) by mx.google.com with ESMTPS id f19sm7912984ibl.66.2011.07.11.13.16.05 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Jul 2011 13:16:06 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org Subject: libgo patch committed: Use abort, not std::abort, in C code Date: Mon, 11 Jul 2011 13:16:04 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-System-Of-Record: true 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 This patch changes std::abort() to abort() in C code. I'm not sure how this was working previously. Bootstrapped on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r 3291a9609c87 libgo/runtime/go-unwind.c --- a/libgo/runtime/go-unwind.c Thu Jul 07 09:48:11 2011 -0700 +++ b/libgo/runtime/go-unwind.c Mon Jul 11 09:59:04 2011 -0700 @@ -293,7 +293,7 @@ break; default: - std::abort(); + abort(); } actions |= state & _US_FORCE_UNWIND;