From patchwork Tue Sep 7 17:34:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 64038 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 4E670B6EEF for ; Wed, 8 Sep 2010 03:34:18 +1000 (EST) Received: (qmail 30449 invoked by alias); 7 Sep 2010 17:34:15 -0000 Received: (qmail 30357 invoked by uid 22791); 7 Sep 2010 17:34:14 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from mail-px0-f175.google.com (HELO mail-px0-f175.google.com) (209.85.212.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 07 Sep 2010 17:34:08 +0000 Received: by pxi11 with SMTP id 11so1432329pxi.20 for ; Tue, 07 Sep 2010 10:34:07 -0700 (PDT) MIME-Version: 1.0 Received: by 10.142.69.1 with SMTP id r1mr23407wfa.119.1283880847044; Tue, 07 Sep 2010 10:34:07 -0700 (PDT) Received: by 10.220.78.193 with HTTP; Tue, 7 Sep 2010 10:34:06 -0700 (PDT) In-Reply-To: <4C8671D6.7090203@redhat.com> References: <20100907163838.GA13615@intel.com> <4C8671D6.7090203@redhat.com> Date: Tue, 7 Sep 2010 10:34:06 -0700 Message-ID: Subject: Re: PATCH: Include only if USE_PT_GNU_EH_FRAME is defined From: "H.J. Lu" To: Richard Henderson Cc: gcc-patches@gcc.gnu.org, Maxim Kuvyrkov 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 On Tue, Sep 7, 2010 at 10:09 AM, Richard Henderson wrote: > On 09/07/2010 09:38 AM, H.J. Lu wrote: >>       * unwind-dw2-fde-glibc.c: Include for DT_CONFIG. >>       Include only if USE_PT_GNU_EH_FRAME is defined. > > Why is Bionic using unwind-dw2-fde-glibc.c?  The *only* point > to using that file is PT_GNU_EH_FRAME.  Rather than make this > change, why not just point Bionic to unwind-dw2-fde.c? > Here is the updated patch. OK for trunk? Thanks. diff --git a/gcc/config.gcc b/gcc/config.gcc index 9325718..bd4c950 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -551,6 +551,7 @@ case ${target} in case $target in *-*-*android*) tm_defines="$tm_defines ANDROID_DEFAULT=1" + tmake_file="${tmake_file} t-android" ;; *) tm_defines="$tm_defines ANDROID_DEFAULT=0" --- /dev/null 2010-08-30 11:58:42.408289357 -0700 +++ gcc-android/gcc/config/t-android 2010-09-07 10:29:47.234704806 -0700 @@ -0,0 +1,23 @@ +# Copyright (C) 2010 +# Free Software Foundation, Inc. +# +# This file is part of GCC. +# +# GCC is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GCC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING3. If not see +# . + +# Use unwind-dw2-fde +LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \ + $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c +LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c