From: Felix Fietkau <nbd@nbd.name>
Date: Sat, 11 Feb 2017 16:37:53 +0000 (+0100)
Subject: gdb: update to version 7.12.1, fix glibc 2.25 build issues
X-Git-Tag: v18.06.0-rc1~3689
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9827c3e9b9d366be2edc8f1d27a1b84d03cfa97d;p=openwrt%2Fstaging%2Fxback.git

gdb: update to version 7.12.1, fix glibc 2.25 build issues

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/devel/gdb/Makefile b/package/devel/gdb/Makefile
index dc8df7c5a2..159a635774 100644
--- a/package/devel/gdb/Makefile
+++ b/package/devel/gdb/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gdb
-PKG_VERSION:=7.11.1
+PKG_VERSION:=7.12.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/gdb
-PKG_HASH:=e9216da4e3755e9f414c1aa0026b626251dfc57ffe572a266e98da4f6988fc70
+PKG_HASH:=4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
diff --git a/package/devel/gdb/patches/001-gdb-pr14523-mips-signal-number.patch b/package/devel/gdb/patches/001-gdb-pr14523-mips-signal-number.patch
index 417142419a..25ac86fd91 100644
--- a/package/devel/gdb/patches/001-gdb-pr14523-mips-signal-number.patch
+++ b/package/devel/gdb/patches/001-gdb-pr14523-mips-signal-number.patch
@@ -2,7 +2,7 @@ See http://sourceware.org/bugzilla/show_bug.cgi?id=14523
 ---
 --- a/gdb/common/signals.c
 +++ b/gdb/common/signals.c
-@@ -344,6 +344,11 @@ gdb_signal_from_host (int hostsig)
+@@ -348,6 +348,11 @@ gdb_signal_from_host (int hostsig)
        else if (64 <= hostsig && hostsig <= 127)
  	return (enum gdb_signal)
  	  (hostsig - 64 + (int) GDB_SIGNAL_REALTIME_64);
diff --git a/package/devel/gdb/patches/100-musl_fix.patch b/package/devel/gdb/patches/100-musl_fix.patch
index 09146c5638..b167fe6ecd 100644
--- a/package/devel/gdb/patches/100-musl_fix.patch
+++ b/package/devel/gdb/patches/100-musl_fix.patch
@@ -50,4 +50,4 @@
 +#undef pt_regs
  
  #include "nat/ppc-linux.h"
- 
+ #include "linux-ppc-tdesc.h"
diff --git a/package/devel/gdb/patches/110-shared_libgcc.patch b/package/devel/gdb/patches/110-shared_libgcc.patch
new file mode 100644
index 0000000000..e44616f4a2
--- /dev/null
+++ b/package/devel/gdb/patches/110-shared_libgcc.patch
@@ -0,0 +1,76 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1406,13 +1406,13 @@ if test -z "$LD"; then
+   fi
+ fi
+ 
+-# Check whether -static-libstdc++ -static-libgcc is supported.
++# Check whether -static-libstdc++ is supported.
+ have_static_libs=no
+ if test "$GCC" = yes; then
+   saved_LDFLAGS="$LDFLAGS"
+ 
+-  LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
+-  AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
++  LDFLAGS="$LDFLAGS -static-libstdc++"
++  AC_MSG_CHECKING([whether g++ accepts -static-libstdc++])
+   AC_LANG_PUSH(C++)
+   AC_LINK_IFELSE([
+ #if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+@@ -1740,7 +1740,7 @@ AC_ARG_WITH(stage1-ldflags,
+  # if supported.  But if the user explicitly specified the libraries to use,
+  # trust that they are doing what they want.
+  if test "$stage1_libs" = "" -a "$have_static_libs" = yes; then
+-   stage1_ldflags="-static-libstdc++ -static-libgcc"
++   stage1_ldflags="-static-libstdc++"
+  fi])
+ AC_SUBST(stage1_ldflags)
+ 
+@@ -1769,7 +1769,7 @@ AC_ARG_WITH(boot-ldflags,
+  # statically.  But if the user explicitly specified the libraries to
+  # use, trust that they are doing what they want.
+  if test "$poststage1_libs" = ""; then
+-   poststage1_ldflags="-static-libstdc++ -static-libgcc"
++   poststage1_ldflags="-static-libstdc++"
+  fi])
+ AC_SUBST(poststage1_ldflags)
+ 
+--- a/configure
++++ b/configure
+@@ -5109,14 +5109,14 @@ if test -z "$LD"; then
+   fi
+ fi
+ 
+-# Check whether -static-libstdc++ -static-libgcc is supported.
++# Check whether -static-libstdc++ is supported.
+ have_static_libs=no
+ if test "$GCC" = yes; then
+   saved_LDFLAGS="$LDFLAGS"
+ 
+-  LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++ -static-libgcc" >&5
+-$as_echo_n "checking whether g++ accepts -static-libstdc++ -static-libgcc... " >&6; }
++  LDFLAGS="$LDFLAGS -static-libstdc++"
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++" >&5
++$as_echo_n "checking whether g++ accepts -static-libstdc++... " >&6; }
+   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -5902,7 +5902,7 @@ else
+  # if supported.  But if the user explicitly specified the libraries to use,
+  # trust that they are doing what they want.
+  if test "$stage1_libs" = "" -a "$have_static_libs" = yes; then
+-   stage1_ldflags="-static-libstdc++ -static-libgcc"
++   stage1_ldflags="-static-libstdc++"
+  fi
+ fi
+ 
+@@ -5938,7 +5938,7 @@ else
+  # statically.  But if the user explicitly specified the libraries to
+  # use, trust that they are doing what they want.
+  if test "$poststage1_libs" = ""; then
+-   poststage1_ldflags="-static-libstdc++ -static-libgcc"
++   poststage1_ldflags="-static-libstdc++"
+  fi
+ fi
+