From 8ac06474ff1e2aa4920d14e0666b083eeaca8952 Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Sun, 25 Aug 2019 16:37:00 -0400 Subject: [PATCH] Rebase to FSF GDB 8.3.50.20190824 (8.4pre). Update 'v1.5-libipt-static.patch'. --- .gitignore | 2 +- _git_upstream_commit | 2 +- gdb-attach-fail-reasons-5of5.patch | 8 ++++---- gdb-container-rh-pkg.patch | 2 +- gdb-linux_perf-bundle.patch | 4 ++-- gdb-vla-intel-fortran-vla-strings.patch | 2 +- gdb.spec | 9 +++++++-- sources | 2 +- v1.5-libipt-static.patch | 13 ------------- 9 files changed, 18 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 5f27409..018e178 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz -/gdb-8.3.50.20190816.tar.xz /v2.0.1.tar.gz +/gdb-8.3.50.20190824.tar.xz diff --git a/_git_upstream_commit b/_git_upstream_commit index 46967e7..e39b07c 100644 --- a/_git_upstream_commit +++ b/_git_upstream_commit @@ -1 +1 @@ -33394263571f08a935c0a030dbde22a04eee7d70 +8a9455cc824134d40943c34dc2cd44bee8275083 diff --git a/gdb-attach-fail-reasons-5of5.patch b/gdb-attach-fail-reasons-5of5.patch index fe758e7..6df2ce8 100644 --- a/gdb-attach-fail-reasons-5of5.patch +++ b/gdb-attach-fail-reasons-5of5.patch @@ -68,7 +68,7 @@ diff --git a/gdb/config.in b/gdb/config.in diff --git a/gdb/configure b/gdb/configure --- a/gdb/configure +++ b/gdb/configure -@@ -15642,6 +15642,64 @@ cat >>confdefs.h <<_ACEOF +@@ -15647,6 +15647,64 @@ cat >>confdefs.h <<_ACEOF _ACEOF @@ -136,7 +136,7 @@ diff --git a/gdb/configure b/gdb/configure diff --git a/gdb/configure.ac b/gdb/configure.ac --- a/gdb/configure.ac +++ b/gdb/configure.ac -@@ -2009,6 +2009,10 @@ case $host_os in +@@ -2016,6 +2016,10 @@ case $host_os in esac AC_DEFINE_UNQUOTED(GDBINIT,"$gdbinit",[The .gdbinit filename.]) @@ -150,7 +150,7 @@ diff --git a/gdb/configure.ac b/gdb/configure.ac diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in --- a/gdb/gdbserver/config.in +++ b/gdb/gdbserver/config.in -@@ -123,6 +123,9 @@ +@@ -126,6 +126,9 @@ /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL @@ -160,7 +160,7 @@ diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in /* Define if the target supports branch tracing. */ #undef HAVE_LINUX_BTRACE -@@ -199,6 +202,9 @@ +@@ -202,6 +205,9 @@ /* Define to 1 if you have the `pwrite' function. */ #undef HAVE_PWRITE diff --git a/gdb-container-rh-pkg.patch b/gdb-container-rh-pkg.patch index 73955f0..c8fc69d 100644 --- a/gdb-container-rh-pkg.patch +++ b/gdb-container-rh-pkg.patch @@ -9,7 +9,7 @@ Subject: gdb-container-rh-pkg.patch diff --git a/gdb/remote.c b/gdb/remote.c --- a/gdb/remote.c +++ b/gdb/remote.c -@@ -13922,7 +13922,17 @@ remote_target::pid_to_exec_file (int pid) +@@ -13927,7 +13927,17 @@ remote_target::pid_to_exec_file (int pid) char *annex = NULL; if (packet_support (PACKET_qXfer_exec_file) != PACKET_ENABLE) diff --git a/gdb-linux_perf-bundle.patch b/gdb-linux_perf-bundle.patch index be09279..e0195e6 100644 --- a/gdb-linux_perf-bundle.patch +++ b/gdb-linux_perf-bundle.patch @@ -9,7 +9,7 @@ Subject: gdb-linux_perf-bundle.patch diff --git a/gdb/configure b/gdb/configure --- a/gdb/configure +++ b/gdb/configure -@@ -11881,7 +11881,7 @@ else +@@ -11887,7 +11887,7 @@ else #include #ifndef PERF_ATTR_SIZE_VER5 @@ -21,7 +21,7 @@ diff --git a/gdb/configure b/gdb/configure diff --git a/gdb/configure.ac b/gdb/configure.ac --- a/gdb/configure.ac +++ b/gdb/configure.ac -@@ -1458,7 +1458,7 @@ else +@@ -1466,7 +1466,7 @@ else AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ #include #ifndef PERF_ATTR_SIZE_VER5 diff --git a/gdb-vla-intel-fortran-vla-strings.patch b/gdb-vla-intel-fortran-vla-strings.patch index 1546d07..c666c59 100644 --- a/gdb-vla-intel-fortran-vla-strings.patch +++ b/gdb-vla-intel-fortran-vla-strings.patch @@ -33,7 +33,7 @@ git diff --stat -p gdb/master...gdb/users/bheckel/fortran-vla-strings diff --git a/gdb/NEWS b/gdb/NEWS --- a/gdb/NEWS +++ b/gdb/NEWS -@@ -653,6 +653,8 @@ SH-5/SH64 running OpenBSD SH-5/SH64 support in sh*-*-openbsd* +@@ -660,6 +660,8 @@ SH-5/SH64 running OpenBSD SH-5/SH64 support in sh*-*-openbsd* *** Changes in GDB 8.1 diff --git a/gdb.spec b/gdb.spec index aec42aa..3ce9d57 100644 --- a/gdb.spec +++ b/gdb.spec @@ -27,7 +27,7 @@ Name: %{?scl_prefix}gdb # Freeze it when GDB gets branched -%global snapsrc 20190816 +%global snapsrc 20190824 # See timestamp of source gnulib installed into gdb/gnulib/ . %global snapgnulib 20161115 %global tarname gdb-%{version} @@ -35,7 +35,7 @@ Version: 8.3.50.%{snapsrc} # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 25%{?dist} +Release: 26%{?dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL # Do not provide URL for snapshots as the file lasts there only for 2 days. @@ -656,6 +656,7 @@ CFLAGS="$CFLAGS -DNEED_DETACH_SIGSTOP" %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DPTUNIT:BOOL=OFF \ -DDEVBUILD:BOOL=ON \ + -DBUILD_SHARED_LIBS=OFF \ ../../libipt-%{libipt_version} make VERBOSE=1 %{?_smp_mflags} ctest -V %{?_smp_mflags} @@ -1141,6 +1142,10 @@ fi %endif %changelog +* Sat Aug 24 2019 Sergio Durigan Junior - 8.3.50.20190824-26 +- Rebase to FSF GDB 8.3.50.20190824 (8.4pre). +- Update 'v1.5-libipt-static.patch'. + * Wed Aug 21 2019 Miro Hrončok - Rebuilt for Python 3.8 diff --git a/sources b/sources index e98d8d7..23b567a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gdb-libstdc++-v3-python-8.1.1-20180626.tar.xz) = a8b1c54dd348cfeb37da73f968742896be3dd13a4215f8d8519870c2abea915f5176c3fa6989ddd10f20020a16f0fab20cbae68ee8d58a82234d8778023520f8 -SHA512 (gdb-8.3.50.20190816.tar.xz) = 03f7572bbceead6f1739d981cb89c38830b55432f3f5012d9d72f7c4bf296bed2d9bd3523ea724b097dfbf0d563cb96c637ee8a6efa8f232330dfe9a5e14bb42 SHA512 (v2.0.1.tar.gz) = e38e93908c3fbf1f2384cfca381eaf4bf667033de678041bd440adac8bbce4757b77304868896256ed72c202ee22ba1646aada90125029f14f5bffaf828a7df4 +SHA512 (gdb-8.3.50.20190824.tar.xz) = 2a61acd207f3dcb3d047ad88ddd5662a596ca73b3e76efe42a0132032ba97b2258153831c2ca2523d10369591d5c72bef445b26e22554c46e38ee69903e09cf4 diff --git a/v1.5-libipt-static.patch b/v1.5-libipt-static.patch index 6599445..69e1d1a 100644 --- a/v1.5-libipt-static.patch +++ b/v1.5-libipt-static.patch @@ -1,16 +1,3 @@ -Index: processor-trace-2.0/libipt/CMakeLists.txt -=================================================================== ---- processor-trace-2.0.orig/libipt/CMakeLists.txt -+++ processor-trace-2.0/libipt/CMakeLists.txt -@@ -85,7 +85,7 @@ endif (CMAKE_HOST_WIN32) - - set(LIBIPT_FILES ${LIBIPT_FILES} ${LIBIPT_SECTION_FILES}) - --add_library(libipt SHARED -+add_library(libipt STATIC - ${LIBIPT_FILES} - ) - Index: processor-trace-2.0/libipt/src/posix/init.c =================================================================== --- processor-trace-2.0.orig/libipt/src/posix/init.c