gdb/gdb-jit-reader-multilib.patch

diff --git a/gdb/configure b/gdb/configure
index 7ff74ba..00a5b5b 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -7382,10 +7382,12 @@ _ACEOF
 
 
 
-if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
-  TARGET_PTR="unsigned long"
-elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
+# Try to keep TARGET_PTR the same across archs so that jit-reader.h file
+# content is the same for multilib distributions.
+if test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
   TARGET_PTR="unsigned long long"
+elif test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
+  TARGET_PTR="unsigned long"
 elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then
   TARGET_PTR="unsigned __int128"
 else
diff --git a/gdb/configure.ac b/gdb/configure.ac
index ec776d7..c02ace9 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -648,10 +648,12 @@ AC_CHECK_SIZEOF(unsigned long long)
 AC_CHECK_SIZEOF(unsigned long)
 AC_CHECK_SIZEOF(unsigned __int128)
 
-if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
-  TARGET_PTR="unsigned long"
-elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
+# Try to keep TARGET_PTR the same across archs so that jit-reader.h file
+# content is the same for multilib distributions.
+if test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then
   TARGET_PTR="unsigned long long"
+elif test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then
+  TARGET_PTR="unsigned long"
 elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then
   TARGET_PTR="unsigned __int128"
 else
- Use patchlist.pl to merge with gdb-7.9-10.fc22, a rebase to FSF GDB 7.9. The GDB 7.8 features are: * Python Scripting - You can now access frame registers from Python scripts. - New attribute 'producer' for gdb.Symtab objects. * New Python-based convenience functions: - $_caller_is(name [, number_of_frames]) - $_caller_matches(regexp [, number_of_frames]) - $_any_caller_is(name [, number_of_frames]) - $_any_caller_matches(regexp [, number_of_frames]) * New commands - queue-signal signal-name-or-number Queue a signal to be delivered to the thread when it is resumed. * On resume, GDB now always passes the signal the program had stopped for to the thread the signal was sent to, even if the user changed threads before resuming. Previously GDB would often (but not always) deliver the signal to the thread that happens to be current at resume time. * Conversely, the "signal" command now consistently delivers the requested signal to the current thread. GDB now asks for confirmation if the program had stopped for a signal and the user switched threads meanwhile. * "breakpoint always-inserted" modes "off" and "auto" merged. Now, when 'breakpoint always-inserted mode' is set to "off", GDB won't remove breakpoints from the target until all threads stop, even in non-stop mode. The "auto" mode has been removed, and "off" is now the default mode. * MI changes - The -list-thread-groups command outputs an exit-code field for inferiors that have exited. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=115 2015-02-25 13:45:10 +00:00			`diff --git a/gdb/configure b/gdb/configure`
			`index 7ff74ba..00a5b5b 100755`
			`--- a/gdb/configure`
			`+++ b/gdb/configure`
			`@@ -7382,10 +7382,12 @@ _ACEOF`



			`-if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then`
			`- TARGET_PTR="unsigned long"`
			`-elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then`
			`+# Try to keep TARGET_PTR the same across archs so that jit-reader.h file`
			`+# content is the same for multilib distributions.`
			`+if test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then`
			`TARGET_PTR="unsigned long long"`
			`+elif test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then`
			`+ TARGET_PTR="unsigned long"`
			`elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then`
			`TARGET_PTR="unsigned __int128"`
			`else`
			`diff --git a/gdb/configure.ac b/gdb/configure.ac`
			`index ec776d7..c02ace9 100644`
			`--- a/gdb/configure.ac`
			`+++ b/gdb/configure.ac`
			`@@ -648,10 +648,12 @@ AC_CHECK_SIZEOF(unsigned long long)`
			`AC_CHECK_SIZEOF(unsigned long)`
			`AC_CHECK_SIZEOF(unsigned __int128)`

			`-if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then`
			`- TARGET_PTR="unsigned long"`
			`-elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then`
			`+# Try to keep TARGET_PTR the same across archs so that jit-reader.h file`
			`+# content is the same for multilib distributions.`
			`+if test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then`
			`TARGET_PTR="unsigned long long"`
			`+elif test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then`
			`+ TARGET_PTR="unsigned long"`
			`elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then`
			`TARGET_PTR="unsigned __int128"`
			`else`