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 --git a/binutils/ChangeLog b/binutils/ChangeLog
index 25ba6084e869454b283fcf444fffafcf86173ed8..33bb59bf413e79034b04afeb005f682c2a19b21d 100644 (file)
--- 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 24f8423ebc59a7225b9d25fe1699314d35ea8222..e2f9e5cb5789016f754d782c1e4430dcf0314967 100644 (file)
--- 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 fee05dfa84a8c8012c056a19068cd6bc9603873f..32f2e20375ad29af54a6d23534dad3252a753be0 100644 (file)
--- 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 786d0881ca978dcc6a98052634b0174ea6256b41..f1ba270f682bfbaad0f6572819a964c7f83277a7 100644 (file)
--- 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 4ff0c4f02767fac54c743b56ce811112b4e620c1..9db77d6a9af040e289efab52174f3ddf5b259a99 100644 (file)
--- 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 5d241e2df848089973d0480f2a9bea356649281f..2a8fdbff1d7f1bc7044bcf36bf01bb55dbbe6a09 100644 (file)
--- 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 0909d6a62ba74dcf483e2817a82258b26888bcf7..d5d37b1da32a50d52403c747896bdbbc379825af 100644 (file)
--- 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 41db0c6016caca18b784c4cb9662138733344497..c9f85e529231a37d3445b861872cc55c8f86f950 100644 (file)
--- 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 712e3f448092e036c7f526fccf74bd077a27f92f..e5eea3886ca126d650d82c5cb1d2732f0568d83a 100644 (file)
--- 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: