This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [patch 4.0/4.1] sed command garbled when generating macro_list


Mark Mitchell writes:
> Matthias Klose wrote:
> > I committed the second variant of this patch by accident in r112647 on
> > the trunk, now approved by Mark. Ok to apply to the 4.0 and 4.1
> > branches as well? Which variant?
> 
> Let's have the version on the trunk for 4.1; there doesn't seem any
> obvious reason to diverge.

finally checked in on the 4.0 and 4.1 branches.

2006-09-06  Matthias Klose  <doko@debian.org>
        * Makefile.in (s-macro_list): Conform to POSIX rules in single quoted
        strings.

Index: Makefile.in
===================================================================
--- Makefile.in (revision 116719)
+++ Makefile.in (revision 116720)
@@ -3149,8 +3149,8 @@
 macro_list: s-macro_list; @true
 s-macro_list : $(GCC_PASSES) 
        echo | $(GCC_FOR_TARGET) -E -dM - | \
-         sed -n 's/^#define \([^_][a-zA-Z0-9_]*\).*/\1/p ; \
-               s/^#define \(_[^_A-Z][a-zA-Z0-9_]*\).*/\1/p' | \
+         sed -n -e 's/^#define \([^_][a-zA-Z0-9_]*\).*/\1/p' \
+               -e 's/^#define \(_[^_A-Z][a-zA-Z0-9_]*\).*/\1/p' | \
          sort -u > tmp-macro_list
        $(SHELL) $(srcdir)/../move-if-change tmp-macro_list macro_list
        $(STAMP) s-macro_list


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]