From: Petar Jovanovic <mips32r2@gmail.com>
Date: Wed, 6 Nov 2019 16:55:11 +0000 (+0000)
Subject: mips: fix configure issue with specific paths
X-Git-Tag: VALGRIND_3_16_0~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f6e97cf6544c5c83945caf01397ac265f6f055a;p=thirdparty%2Fvalgrind.git

mips: fix configure issue with specific paths

If configure is invoked with e.g.

CFLAGS='--sysroot=/workspace/linux-mips64/sysroot -mabi=64'

flags FLAG_M32 and FLAG_M64 are not set, because the grep search in
configure.ac mismatches the mips keyword in the path.

Update the grep patterns to anchor on non-word boundaries.

This fixes KDE #412344.

Patch by Chris Packham.
---

diff --git a/NEWS b/NEWS
index e53bc62556..0de69ee493 100644
--- a/NEWS
+++ b/NEWS
@@ -82,6 +82,7 @@ where XXXXXX is the bug number as listed below.
 409367  exit_group() after signal to thread waiting in futex() causes hangs
 410599  Non-deterministic behaviour of pth_self_kill_15_other test
 411134  Allow the user to change a set of command line options during execution
+412344  Problem setting mips flags with specific paths
 413603  callgrind_annotate/cg_annotate truncate function names at '#'
 
 n-i-bz  Fix minor one time leaks in dhat.
diff --git a/configure.ac b/configure.ac
index 29b88f7cc7..ca9961af53 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1772,7 +1772,7 @@ AM_CONDITIONAL(HAVE_NR_MEMBARRIER, [test x$ac_have_nr_membarrier = xyes])
 
 case "${host_cpu}" in
     mips*)
-        ARCH=$(echo "$CFLAGS" | grep -E -e '-march=@<:@^ @:>@+' -e '-mips@<:@^ +@:>@')
+        ARCH=$(echo "$CFLAGS" | grep -E -e '-march=@<:@^ @:>@+' -e '\B-mips@<:@^ +@:>@')
         if test -z "$ARCH"; then
           # does this compiler support -march=mips32 (mips32 default) ?
           AC_MSG_CHECKING([if gcc accepts -march=mips32 -mabi=32])
@@ -1857,7 +1857,7 @@ case "${host_cpu}" in
 esac
 
 
-ARCH=$(echo "$CFLAGS" | grep -E -e '-march=@<:@^ @:>@+' -e '-mips@<:@^ +@:>@')
+ARCH=$(echo "$CFLAGS" | grep -E -e '-march=@<:@^ @:>@+' -e '\B-mips@<:@^ +@:>@')
 if test -z "$ARCH"; then
   # does this compiler support -march=octeon (Cavium OCTEON I Specific) ?
   AC_MSG_CHECKING([if gcc accepts -march=octeon])