Blame SOURCES/gdb-jit-reader-multilib.patch

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