Merge branch 'gdb-9-branch' into amd-staging-rocgdb-9

Change-Id: I6427b9979d8e5f92d50dd8cdefa923568a33260e

diff --git a/ChangeLog b/ChangeLog
index 8c6046634562093f8954794eda07d0b9e84185c5..211451345e8190316d05a94c463707598b53bf86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2020-02-01  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+       * configure.ac: Don't abort the build if trying to build GDB in tree
+       _and_ invoking with '--enable-src-release-build'.
+       * configure: Regenerate.
+       * src-release.sh (do_proto_toplev): Invoke 'configure' using
+       '--enable-src-release-build'.
+
+2020-01-17  Joel Brobecker  <brobecker@adacore.com>
+
+       * configure.ac: Abort the build with an error if trying to build
+       GDB in tree.
+       * configure: Regenerate.
+
 2019-10-17  Sergio Durigan Junior  <sergiodj@redhat.com>
 
        * src-release.sh (GDB_SUPPORT_DIRS): Add libctf.

diff --git a/bfd/version.h b/bfd/version.h
index b8e8fcf063550de42901d1e114a1a9cee5aa6e7d..c10d709b9510fa31599c834ec24225b44b7af2a0 100644 (file)
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -16,7 +16,7 @@
 
    In releases, the date is not included in either version strings or
    sonames.  */
-#define BFD_VERSION_DATE 20200115
+#define BFD_VERSION_DATE 20200206
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@

diff --git a/configure b/configure
index 6a9719f60911b43a61f13bb2a267cf21941ebd84..276f33fee39208e71210c8fb70ff1b3d4e7401b6 100755 (executable)
--- a/configure
+++ b/configure
@@ -2279,6 +2279,23 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+if test x"${enable_gdb}" != x"no" -a x"${enable_src_release_build}" != x"yes"; then
+  # For this branch, we do not support building GDB in-tree.
+  # Try to detect whether we are in this situation or not by
+  # searching for a couple of known files in the source directory.
+  if test -f gnulib/update-gnulib.sh -a -f gdb/ChangeLog; then
+    as_fn_error $? "GDB must be configured and built in a directory separate from its sources.
+
+To do so, create a dedicated directory for your GDB build and invoke
+the configure script from that directory:
+
+      $ mkdir build
+      $ cd build
+      $ <full path to your sources>/gdb-VERSION/configure [etc...]
+      $ make" "$LINENO" 5
+  fi
+fi
+
 progname=$0
 # if PWD already has a value, it is probably wrong.
 if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi

diff --git a/configure.ac b/configure.ac
index 7433badc217f06710d5aa4ebaf580a0b2d00e5ce..cd0867dd76d7c1b21de783b744ef4eb2a99a13c4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,23 @@ m4_include([config/isl.m4])
 AC_INIT(move-if-change)
 AC_DISABLE_OPTION_CHECKING
 
+if test x"${enable_gdb}" != x"no" -a x"${enable_src_release_build}" != x"yes"; then
+  # For this branch, we do not support building GDB in-tree.
+  # Try to detect whether we are in this situation or not by
+  # searching for a couple of known files in the source directory.
+  if test -f gnulib/update-gnulib.sh -a -f gdb/ChangeLog; then
+    AC_MSG_ERROR([GDB must be configured and built in a directory separate from its sources.
+
+To do so, create a dedicated directory for your GDB build and invoke
+the configure script from that directory:
+
+      $ mkdir build
+      $ cd build
+      $ <full path to your sources>/gdb-VERSION/configure [[etc...]]
+      $ make])
+  fi
+fi
+
 progname=$0
 # if PWD already has a value, it is probably wrong.
 if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a06e7a68b3b4cba2accbb5e2510ea8ed2282001b..a15950ca0b1897d82748685cf82d6cf51d6a878c 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-28  Hannes Domani  <ssbssa@yahoo.de>
+
+       * server.c (handle_qxfer_libraries): Write segment-address with
+       paddress.
+
 2020-01-01  Joel Brobecker  <brobecker@adacore.com>
 
        * server.c (gdbserver_version): Change copyright year to 2020.

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 1bd9faf20d5b3bd775a0cdc1fcb490ec4112bb99..dec41f8eebe41e5f43eb9cabd6346036f8edb50c 100644 (file)
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -1548,8 +1548,8 @@ handle_qxfer_libraries (const char *annex,
 
   for (const dll_info &dll : all_dlls)
     document += string_printf
-      ("  <library name=\"%s\"><segment address=\"0x%lx\"/></library>\n",
-       dll.name.c_str (), (long) dll.base_addr);
+      ("  <library name=\"%s\"><segment address=\"0x%s\"/></library>\n",
+       dll.name.c_str (), paddress (dll.base_addr));
 
   document += "</library-list>\n";
 

diff --git a/libctf/ChangeLog b/libctf/ChangeLog
index 5843cd92e1ebd700ad7a5fa89c15dfaf8ee8908d..940f4022e15c84c635446ba94d8632e32f31b6fe 100644 (file)
--- a/libctf/ChangeLog
+++ b/libctf/ChangeLog
@@ -1,3 +1,10 @@
+2020-02-01  Eli Zaretskii  <eliz@gnu.org>
+
+       PR binutils/25155:
+       * ctf-create.c (EOVERFLOW): If not defined by system header,
+       redirect to ERANGE as a poor man's substitute.
+       * ctf-subr.c (ENOTSUP): If not defined, use ENOSYS instead.
+
 2020-01-05  Joel Brobecker  <brobecker@adacore.com>
 
        PR binutils/25155:

diff --git a/libctf/ctf-create.c b/libctf/ctf-create.c
index fa40100c770114a0154ac7665bb6132ce6491cff..84aa4526a30ebea6f9b66be698c8cd7fc4162bd8 100644 (file)
--- a/libctf/ctf-create.c
+++ b/libctf/ctf-create.c
@@ -23,6 +23,10 @@
 #include <string.h>
 #include <zlib.h>
 
+#ifndef EOVERFLOW
+#define EOVERFLOW ERANGE
+#endif
+
 #ifndef roundup
 #define roundup(x, y)  ((((x) + ((y) - 1)) / (y)) * (y))
 #endif

diff --git a/libctf/ctf-subr.c b/libctf/ctf-subr.c
index 6bd7f10aeeac0dde395f57936742b637fcd2b3a5..cc275c507c9ed0893902427f93077abb5be5bc09 100644 (file)
--- a/libctf/ctf-subr.c
+++ b/libctf/ctf-subr.c
@@ -26,6 +26,10 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifndef ENOTSUP
+#define ENOTSUP ENOSYS
+#endif
+
 int _libctf_version = CTF_VERSION;           /* Library client version.  */
 int _libctf_debug = 0;                       /* Debugging messages enabled.  */
 

diff --git a/src-release.sh b/src-release.sh
index 275f0f24b5d3c1a3e764865684eb8495b55c2378..68e824c74921637887da0668e291776ed15eb80f 100755 (executable)
--- a/src-release.sh
+++ b/src-release.sh
@@ -99,8 +99,8 @@ do_proto_toplev()
            *) disables="$disables --disable-$dir" ;;
        esac
     done
-    echo "==> configure --target=i386-pc-linux-gnu $disables $enables"
-    ./configure --target=i386-pc-linux-gnu $disables $enables
+    echo "==> configure --target=i386-pc-linux-gnu --enable-src-release-build=yes $disables $enables"
+    ./configure --target=i386-pc-linux-gnu --enable-src-release-build=yes $disables $enables
     $MAKE configure-host configure-target \
        ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
        CC_FOR_TARGET="$CC" CXX_FOR_TARGET="$CXX"