Patchwork add inc to list of suffix in libsanitizer/merge.sh

login
register
mail settings
Submitter Jack Howarth
Date Jan. 18, 2013, 5:39 p.m.
Message ID <20130118173903.GA26620@bromo.med.uc.edu>
Download mbox | patch
Permalink /patch/213691/
State New
Headers show

Comments

Jack Howarth - Jan. 18, 2013, 5:39 p.m.
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 <howarth@bromo.med.uc.edu>

	merge.sh: Add inc suffix for merged file listing.
Konstantin Serebryany - Jan. 18, 2013, 5:54 p.m.
ok, thanks!
(that was quick!)

--kcc

On Fri, Jan 18, 2013 at 9:39 PM, Jack Howarth <howarth@bromo.med.uc.edu> wrote:
>    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 <howarth@bromo.med.uc.edu>
>
>         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)
>
>  }
>

Patch

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)
 
 }