2 files changed, 40 insertions, 0 deletions

diff --git a/meta/recipes-devtools/gdb/gdb-7.6.1.inc b/meta/recipes-devtools/gdb/gdb-7.6.1.inc
index d1270f97a4..e5777329ab 100644
--- a/meta/recipes-devtools/gdb/gdb-7.6.1.inc
+++ b/meta/recipes-devtools/gdb/gdb-7.6.1.inc
@@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
                     file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
 
+SRC_URI += " file://gdb-fix-cygwin-check-in-configure-script.patch "
+
 S = "${WORKDIR}/${BPN}-${PV}"
 
 SRC_URI[md5sum] = "d42841167fd061d90fddf9a7212a1f9f"
diff --git a/meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch b/meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch
new file mode 100644
index 0000000000..4e4647b0d9
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/gdb-fix-cygwin-check-in-configure-script.patch
@@ -0,0 +1,38 @@
+Avoid false positives if the search pattern "lose" is found in path
+descriptions in comments generated by the preprocessor.
+
+See <https://sourceware.org/bugzilla/show_bug.cgi?id=16152>.
+---
+ gdb/configure    | 2 +-
+ gdb/configure.ac | 2 +-
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/gdb/configure b/gdb/configure
+index 5514b2f..b38e183 100755
+--- a/gdb/configure
++++ b/gdb/configure
+@@ -12446,7 +12446,7 @@ lose
+ #endif
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "lose" >/dev/null 2>&1; then :
++  $EGREP "^lose$" >/dev/null 2>&1; then :
+   gdb_cv_os_cygwin=yes
+ else
+   gdb_cv_os_cygwin=no
+diff --git a/gdb/configure.ac b/gdb/configure.ac
+index 9b73887..2947293 100644
+--- a/gdb/configure.ac
++++ b/gdb/configure.ac
+@@ -1877,7 +1877,7 @@ AC_SUBST(WERROR_CFLAGS)
+ 
+ # In the Cygwin environment, we need some additional flags.
+ AC_CACHE_CHECK([for cygwin], gdb_cv_os_cygwin,
+-[AC_EGREP_CPP(lose, [
++[AC_EGREP_CPP(^lose$, [
+ #if defined (__CYGWIN__) || defined (__CYGWIN32__)
+ lose
+ #endif],[gdb_cv_os_cygwin=yes],[gdb_cv_os_cygwin=no])])
+-- 
+1.8.4
+