From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2443 invoked by alias); 18 Jan 2013 17:39:10 -0000 Received: (qmail 2435 invoked by uid 22791); 18 Jan 2013 17:39:09 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,TW_LV X-Spam-Check-By: sourceware.org Received: from bromo.med.uc.edu (HELO bromo.med.uc.edu) (129.137.3.146) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 18 Jan 2013 17:39:05 +0000 Received: from bromo.med.uc.edu (localhost.localdomain [127.0.0.1]) by bromo.med.uc.edu (Postfix) with ESMTP id 3C23D400007; Fri, 18 Jan 2013 12:39:04 -0500 (EST) Received: (from howarth@localhost) by bromo.med.uc.edu (8.14.3/8.14.3/Submit) id r0IHd3LR026622; Fri, 18 Jan 2013 12:39:03 -0500 Date: Fri, 18 Jan 2013 17:39:00 -0000 From: Jack Howarth To: gcc-patches@gcc.gnu.org Cc: jakub@redhat.com, dodji@redhat.com, kcc@google.com, dvyukov@google.com Subject: [PATCH] add inc to list of suffix in libsanitizer/merge.sh Message-ID: <20130118173903.GA26620@bromo.med.uc.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2013-01/txt/msg00968.txt.bz2 Upstream llvm compiler-rts asan subdirectory now includes files with the *.inc suffix. The attached patch adds this new suffix to the list of merged files. Okay for gcc trunk? Jack libsanitizer/ 2013-01-18 Jack Howarth merge.sh: Add inc suffix for merged file listing. Index: libsanitizer/merge.sh =================================================================== --- libsanitizer/merge.sh (revision 195295) +++ libsanitizer/merge.sh (working copy) @@ -16,7 +16,7 @@ get_current_rev() { } list_files() { - (cd $1; ls *.{cc,h} 2> /dev/null) + (cd $1; ls *.{cc,h,inc} 2> /dev/null) }