From a76bf0e55d84e8529a337cad278814ba2e30d3af Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 7 Nov 2020 21:28:47 +0100 Subject: 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. --- 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 25ba608..33bb59b 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2020-11-09 Andreas Schwab + + * Makefile.am (development.exp): Fix regexp. + * Makefile.in: Regenerate. + 2020-11-09 Nick Clifton PR 26847 diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 24f8423..e2f9e5c 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 fee05df..32f2e20 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 786d088..f1ba270 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2020-11-09 Andreas Schwab + + * Makefile.am (development.exp): Fix regexp. + * Makefile.in: Regenerate. + 2020-11-09 Nelson Chu * config/tc-riscv.c (explicit_mabi): New boolean to indicate if diff --git a/gas/Makefile.am b/gas/Makefile.am index 4ff0c4f..9db77d6 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 5d241e2..2a8fdbf 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 0909d6a..d5d37b1 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2020-11-09 Andreas Schwab + + * Makefile.am (development.exp): Fix regexp. + * Makefile.in: Regenerate. + 2020-11-06 Nick Clifton * lexsup.c (parse_args): Add more checks of the mapfile. If it is diff --git a/ld/Makefile.am b/ld/Makefile.am index 41db0c6..c9f85e5 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 712e3f4..e5eea38 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: -- cgit v1.1