[binutils-gdb] Fix regexp for development.exp

Andreas Schwab schwab@sourceware.org
Mon Nov 9 11:06:46 GMT 2020


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a76bf0e55d84e8529a337cad278814ba2e30d3af

commit a76bf0e55d84e8529a337cad278814ba2e30d3af
Author: Andreas Schwab <schwab@linux-m68k.org>
Date:   Sat Nov 7 21:28:47 2020 +0100

    Fix regexp for development.exp
    
    binutils/:
            * Makefile.am (development.exp): Fix regexp.
            * Makefile.in: Regenerate.
    gas/:
            * Makefile.am (development.exp): Fix regexp.
            * Makefile.in: Regenerate.
    ld/:
            * Makefile.am (development.exp): Fix regexp.
            * Makefile.in: Regenerate.

Diff:
---
 binutils/ChangeLog   | 5 +++++
 binutils/Makefile.am | 2 +-
 binutils/Makefile.in | 2 +-
 gas/ChangeLog        | 5 +++++
 gas/Makefile.am      | 2 +-
 gas/Makefile.in      | 2 +-
 ld/ChangeLog         | 5 +++++
 ld/Makefile.am       | 2 +-
 ld/Makefile.in       | 2 +-
 9 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 25ba6084e86..33bb59bf413 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2020-11-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* Makefile.am (development.exp): Fix regexp.
+	* Makefile.in: Regenerate.
+
 2020-11-09  Nick Clifton  <nickc@redhat.com>
 
 	PR 26847
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 24f8423ebc5..e2f9e5cb578 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -213,7 +213,7 @@ check-DEJAGNU: site.exp
 	fi
 
 development.exp: $(BFDDIR)/development.sh
-	$(EGREP) "[development|experimental]=" $(BFDDIR)/development.sh  \
+	$(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh  \
 	  | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@
 
 installcheck-local:
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index fee05dfa84a..32f2e20375a 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -1448,7 +1448,7 @@ check-DEJAGNU: site.exp
 	fi
 
 development.exp: $(BFDDIR)/development.sh
-	$(EGREP) "[development|experimental]=" $(BFDDIR)/development.sh  \
+	$(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh  \
 	  | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@
 
 installcheck-local:
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 786d0881ca9..f1ba270f682 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2020-11-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* Makefile.am (development.exp): Fix regexp.
+	* Makefile.in: Regenerate.
+
 2020-11-09  Nelson Chu  <nelson.chu@sifive.com>
 
 	* config/tc-riscv.c (explicit_mabi): New boolean to indicate if
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 4ff0c4f0276..9db77d6a9af 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -434,7 +434,7 @@ check-DEJAGNU: site.exp
 	fi
 
 development.exp: $(BFDDIR)/development.sh
-	$(EGREP) "[development|experimental]=" $(BFDDIR)/development.sh  \
+	$(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh  \
 	  | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@
 
 # The m68k operand parser.
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 5d241e2df84..2a8fdbff1d7 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -1570,7 +1570,7 @@ check-DEJAGNU: site.exp
 	fi
 
 development.exp: $(BFDDIR)/development.sh
-	$(EGREP) "[development|experimental]=" $(BFDDIR)/development.sh  \
+	$(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh  \
 	  | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@
 
 # If m68k-parse.y is in a different directory, then ylwrap will use an
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0909d6a62ba..d5d37b1da32 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2020-11-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* Makefile.am (development.exp): Fix regexp.
+	* Makefile.in: Regenerate.
+
 2020-11-06  Nick Clifton  <nickc@redhat.com>
 
 	* lexsup.c (parse_args): Add more checks of the mapfile.  If it is
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 41db0c6016c..c9f85e52923 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -974,7 +974,7 @@ check-DEJAGNU: site.exp
 	fi
 
 development.exp: $(BFDDIR)/development.sh
-	$(EGREP) "[development|experimental]=" $(BFDDIR)/development.sh  \
+	$(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh  \
 	  | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@
 
 enablings.exp:
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 712e3f44809..e5eea3886ca 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -2551,7 +2551,7 @@ check-DEJAGNU: site.exp
 	fi
 
 development.exp: $(BFDDIR)/development.sh
-	$(EGREP) "[development|experimental]=" $(BFDDIR)/development.sh  \
+	$(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh  \
 	  | $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@
 
 enablings.exp:


More information about the Binutils-cvs mailing list