From patchwork Thu Aug 23 22:49:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Shen X-Patchwork-Id: 179736 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 5E5EE2C00BF for ; Fri, 24 Aug 2012 08:49:40 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1346366981; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: MIME-Version:Received:Received:Date:Message-ID:Subject:From:To: Cc:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=J3ehHR7 7RaUyLLXPXwvIACybk1U=; b=iRu5zb0w3C1KEFYiWszsTFV/HLDd/59i16Ss3Mo Tsw00fArVY0gErmMuTfBqEONuxy8Dk66eNskKxJb+1NUKyaZSZSy3TnhS3GzQ5PY Df60eIQu2qwTWDXXoG/97C4sl6fhNUbT0c/qL93oYgknpRfkf5pZnKrfnI8D0E5D wfo8= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-Google-DKIM-Signature:Received:MIME-Version:Received:Received:Date:Message-ID:Subject:From:To:Cc:Content-Type:X-System-Of-Record:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=QjOCr3iNDhiYfN9Z1e34M/xbZRkli/tt3be8AS5G8YVARbYH94k1xLYJKpuoJC KFxphLvn2IZKkWU+TxG11xzMRyEY0sTeJYq3Mobaq9bB/KPmK6L+XGhGg/G6lJ5C QznUZIgzEiIhNINDFPdt9iSnSR5TucnWX7SL4gvROB9IQ=; Received: (qmail 6511 invoked by alias); 23 Aug 2012 22:49:36 -0000 Received: (qmail 6500 invoked by uid 22791); 23 Aug 2012 22:49:35 -0000 X-SWARE-Spam-Status: No, hits=-4.2 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail-vc0-f175.google.com (HELO mail-vc0-f175.google.com) (209.85.220.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 23 Aug 2012 22:49:21 +0000 Received: by vcbfy27 with SMTP id fy27so1629781vcb.20 for ; Thu, 23 Aug 2012 15:49:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type :x-system-of-record:x-gm-message-state; bh=wURNGJsF2z2AYRXlrcvEifGaWK7XAITAheC9QlouFqI=; b=CVfcCxy9jEQlJKwy1B408lok+s7eYHAmMEz8gDYvUEgNJL7WZLKNmGV6f8PvNkev7O n/ZCzq0hWq8Aq4YkcLaXlbe7EihnoXPrzRGNS/NTk215xEjO41SYA0H09xHs8sn/WalD Qw6H8INYpXtGRiY4kecMbb8DeY7ECEMJ6FOAyYmfk6sBDCKjU132HNOcfi4F5WGIjB6m 9fVgP1oVX7tasvS0D4bRlJirXBZ4IKVZvJRs2WOyTj75UaZGLOUMokHI+6/MNF9JRHLV 6VgBsWrEE4KUXAG/f+R2c7RqwFuFZ3upxe7diu5x7Pof/Z1FYS5zNNIZPKKi/F6wxXfd OPcg== Received: by 10.52.28.169 with SMTP id c9mr2435999vdh.3.1345762160793; Thu, 23 Aug 2012 15:49:20 -0700 (PDT) MIME-Version: 1.0 Received: by 10.52.28.169 with SMTP id c9mr2435975vdh.3.1345762160277; Thu, 23 Aug 2012 15:49:20 -0700 (PDT) Received: by 10.52.159.234 with HTTP; Thu, 23 Aug 2012 15:49:20 -0700 (PDT) Date: Thu, 23 Aug 2012 15:49:20 -0700 Message-ID: Subject: [google/gcc-4_7-mobile] Backport patch from google/gcc-4_7 From: =?UTF-8?B?SGFuIFNoZW4o5rKI5ra1KQ==?= To: Ahmad Sharif , gcc-patches@gcc.gnu.org Cc: Luis Lozano , Caroline Tice , Yunlian Jiang , Bhaskar , Guozhi Wei X-System-Of-Record: true X-Gm-Message-State: ALoCoQkjdPb29JCW8aynKpCwJbNwt1gxSdN0erGfnPqXeLq/N5Mmmsn7pL4F2NjFyN0XEDhRAy6tQLz0wrSTBg67AEsXloyF4Z6PdH4WjxFwyNMPg2LmSq7Xi7Jf2O9OC2oQEJ8u+Kavv+WvA2eZ09CUbm0h5WkwLlm9mZcFEzATyT0QncPlNJcDDCOaL4A/WrGFLX1igebf 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 Hi Ahmad, I'd like you to do a code review, which backports the following patch (r190600) from google/gcc-4_7. 2012-08-22 Han Shen Fixed the problem that LINUX_GRTE_EXTRA_SPECS overrides SUBTARGET_EXTRA_SPECS by prepending LINUX_GRTE_EXTRA_SPECS to SUBTARGET_EXTRA_SPECS. * gcc/config/i386/gnu-user.h (SUBTARGET_EXTRA_SPECS_STR): Add new MACRO to hold value of SUBTARET_EXTRA_SPECS so that SUBTARET_EXTRA_SPECS could be replaced later in gnu-user.h * gcc/config/i386/linux.h (SUBTARGET_EXTRA_SPECS): Compute new value of LINUX_GRTE_EXTRA_SPECS by pre-pending LINUX_GRTE_EXTRA_SPECS to its origin value. Patch here - Property changes on: . Index: ChangeLog.google-4_7 =================================================================== --- ChangeLog.google-4_7 (revision 190632) +++ ChangeLog.google-4_7 (working copy) @@ -1,3 +1,17 @@ +2012-08-22 Han Shen + + Fixed the problem that LINUX_GRTE_EXTRA_SPECS overrides + SUBTARGET_EXTRA_SPECS by prepending LINUX_GRTE_EXTRA_SPECS to + SUBTARGET_EXTRA_SPECS. + + * gcc/config/i386/gnu-user.h (SUBTARGET_EXTRA_SPECS_STR): Add + new MACRO to hold value of SUBTARET_EXTRA_SPECS so that + SUBTARET_EXTRA_SPECS could be replaced later in gnu-user.h + + * gcc/config/i386/linux.h (SUBTARGET_EXTRA_SPECS): Compute new value + of LINUX_GRTE_EXTRA_SPECS by pre-pending LINUX_GRTE_EXTRA_SPECS to its + origin value. + 2012-08-08 Simon Baldwin Cherry pick revision 190232. Property changes on: gcc ___________________________________________________________________ Modified: svn:mergeinfo Merged /branches/google/gcc-4_7/gcc:r190600 Property changes on: gcc/testsuite/gcc.target/powerpc/ppc-round.c ___________________________________________________________________ Modified: svn:mergeinfo Merged /branches/google/gcc-4_7/gcc/testsuite/gcc.target/powerpc/ppc-round.c:r190600 Index: gcc/config/i386/linux.h =================================================================== --- gcc/config/i386/linux.h (revision 190632) +++ gcc/config/i386/linux.h (working copy) @@ -32,5 +32,11 @@ #endif #undef SUBTARGET_EXTRA_SPECS +#ifndef SUBTARGET_EXTRA_SPECS_STR #define SUBTARGET_EXTRA_SPECS \ LINUX_GRTE_EXTRA_SPECS +#else +#define SUBTARGET_EXTRA_SPECS \ + LINUX_GRTE_EXTRA_SPECS \ + SUBTARGET_EXTRA_SPECS_STR +#endif Index: gcc/config/i386/gnu-user.h =================================================================== --- gcc/config/i386/gnu-user.h (revision 190632) +++ gcc/config/i386/gnu-user.h (working copy) @@ -92,11 +92,14 @@ #define ASM_SPEC \ "--32 %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" -#undef SUBTARGET_EXTRA_SPECS -#define SUBTARGET_EXTRA_SPECS \ +#undef SUBTARGET_EXTRA_SPECS_STR +#define SUBTARGET_EXTRA_SPECS_STR \ { "link_emulation", GNU_USER_LINK_EMULATION },\ { "dynamic_linker", GNU_USER_DYNAMIC_LINKER } +#undef SUBTARGET_EXTRA_SPECS +#define SUBTARGET_EXTRA_SPECS SUBTARGET_EXTRA_SPECS_STR + #undef LINK_SPEC #define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ %{!shared: \