gdb: cherry-pick osabi patches from 7.11 to 8.0.1

Cherry-picked commits:
    dfc5ca4 Set the default gdb osabi to GNU/Linux.
    5cbd102 Specify osabi in arm/aarch64 tdescs.

Change-Id: I787f5cafd4bb216934c3cf71aba6f77492c436bc

11 files changed, 16 insertions, 1 deletions

diff --git a/gdb-8.0.1/gdb/configure b/gdb-8.0.1/gdb/configure
index 9f05b4bb7..57ef5152d 100755
--- a/gdb-8.0.1/gdb/configure
+++ b/gdb-8.0.1/gdb/configure
@@ -6626,7 +6626,7 @@ fi
 
 # For other settings, only the main target counts.
 gdb_sim=
-gdb_osabi=
+gdb_osabi=GDB_OSABI_LINUX
 build_gdbserver=
 targ=$target; . ${srcdir}/configure.tgt
 
diff --git a/gdb-8.0.1/gdb/features/aarch64.c b/gdb-8.0.1/gdb/features/aarch64.c
index e9eaed8bf..ce381392e 100644
--- a/gdb-8.0.1/gdb/features/aarch64.c
+++ b/gdb-8.0.1/gdb/features/aarch64.c
@@ -16,6 +16,8 @@ initialize_tdesc_aarch64 (void)
 
   set_tdesc_architecture (result, bfd_scan_arch ("aarch64"));
 
+  set_tdesc_osabi (result, osabi_from_tdesc_string ("GNU/Linux"));
+
   feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64.core");
   type = tdesc_create_flags (feature, "cpsr_flags", 4);
   tdesc_add_flag (type, 0, "SP");
diff --git a/gdb-8.0.1/gdb/features/aarch64.xml b/gdb-8.0.1/gdb/features/aarch64.xml
index e64d7302f..ccfdae5f6 100644
--- a/gdb-8.0.1/gdb/features/aarch64.xml
+++ b/gdb-8.0.1/gdb/features/aarch64.xml
@@ -9,6 +9,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>aarch64</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="aarch64-core.xml"/>
   <xi:include href="aarch64-fpu.xml"/>
 </target>
diff --git a/gdb-8.0.1/gdb/features/arm/arm-with-iwmmxt.c b/gdb-8.0.1/gdb/features/arm/arm-with-iwmmxt.c
index 1770e03e1..e1f5824cb 100644
--- a/gdb-8.0.1/gdb/features/arm/arm-with-iwmmxt.c
+++ b/gdb-8.0.1/gdb/features/arm/arm-with-iwmmxt.c
@@ -16,6 +16,8 @@ initialize_tdesc_arm_with_iwmmxt (void)
 
   set_tdesc_architecture (result, bfd_scan_arch ("iwmmxt"));
 
+  set_tdesc_osabi (result, osabi_from_tdesc_string ("GNU/Linux"));
+
   feature = tdesc_create_feature (result, "org.gnu.gdb.arm.core");
   tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "uint32");
diff --git a/gdb-8.0.1/gdb/features/arm/arm-with-iwmmxt.xml b/gdb-8.0.1/gdb/features/arm/arm-with-iwmmxt.xml
index 4a3e6b964..db4837cd0 100644
--- a/gdb-8.0.1/gdb/features/arm/arm-with-iwmmxt.xml
+++ b/gdb-8.0.1/gdb/features/arm/arm-with-iwmmxt.xml
@@ -8,6 +8,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>iwmmxt</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="arm-core.xml"/>
   <xi:include href="xscale-iwmmxt.xml"/>
 </target>
diff --git a/gdb-8.0.1/gdb/features/arm/arm-with-neon.c b/gdb-8.0.1/gdb/features/arm/arm-with-neon.c
index d365c0fd3..f1ba2633a 100644
--- a/gdb-8.0.1/gdb/features/arm/arm-with-neon.c
+++ b/gdb-8.0.1/gdb/features/arm/arm-with-neon.c
@@ -14,6 +14,8 @@ initialize_tdesc_arm_with_neon (void)
 
   set_tdesc_architecture (result, bfd_scan_arch ("arm"));
 
+  set_tdesc_osabi (result, osabi_from_tdesc_string ("GNU/Linux"));
+
   feature = tdesc_create_feature (result, "org.gnu.gdb.arm.core");
   tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "uint32");
diff --git a/gdb-8.0.1/gdb/features/arm/arm-with-neon.xml b/gdb-8.0.1/gdb/features/arm/arm-with-neon.xml
index eb8c43def..6c43815be 100644
--- a/gdb-8.0.1/gdb/features/arm/arm-with-neon.xml
+++ b/gdb-8.0.1/gdb/features/arm/arm-with-neon.xml
@@ -8,6 +8,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>arm</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="arm-core.xml"/>
   <xi:include href="arm-vfpv3.xml"/>
   <feature name="org.gnu.gdb.arm.neon"/>
diff --git a/gdb-8.0.1/gdb/features/arm/arm-with-vfpv2.c b/gdb-8.0.1/gdb/features/arm/arm-with-vfpv2.c
index 0ebbfef6e..e36eaf366 100644
--- a/gdb-8.0.1/gdb/features/arm/arm-with-vfpv2.c
+++ b/gdb-8.0.1/gdb/features/arm/arm-with-vfpv2.c
@@ -14,6 +14,8 @@ initialize_tdesc_arm_with_vfpv2 (void)
 
   set_tdesc_architecture (result, bfd_scan_arch ("arm"));
 
+  set_tdesc_osabi (result, osabi_from_tdesc_string ("GNU/Linux"));
+
   feature = tdesc_create_feature (result, "org.gnu.gdb.arm.core");
   tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "uint32");
diff --git a/gdb-8.0.1/gdb/features/arm/arm-with-vfpv2.xml b/gdb-8.0.1/gdb/features/arm/arm-with-vfpv2.xml
index 4d43b2f1e..32b260b83 100644
--- a/gdb-8.0.1/gdb/features/arm/arm-with-vfpv2.xml
+++ b/gdb-8.0.1/gdb/features/arm/arm-with-vfpv2.xml
@@ -8,6 +8,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>arm</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="arm-core.xml"/>
   <xi:include href="arm-vfpv2.xml"/>
 </target>
diff --git a/gdb-8.0.1/gdb/features/arm/arm-with-vfpv3.c b/gdb-8.0.1/gdb/features/arm/arm-with-vfpv3.c
index e235dfa76..6455beae5 100644
--- a/gdb-8.0.1/gdb/features/arm/arm-with-vfpv3.c
+++ b/gdb-8.0.1/gdb/features/arm/arm-with-vfpv3.c
@@ -14,6 +14,8 @@ initialize_tdesc_arm_with_vfpv3 (void)
 
   set_tdesc_architecture (result, bfd_scan_arch ("arm"));
 
+  set_tdesc_osabi (result, osabi_from_tdesc_string ("GNU/Linux"));
+
   feature = tdesc_create_feature (result, "org.gnu.gdb.arm.core");
   tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "uint32");
diff --git a/gdb-8.0.1/gdb/features/arm/arm-with-vfpv3.xml b/gdb-8.0.1/gdb/features/arm/arm-with-vfpv3.xml
index 370a522e3..d9bf6f4ac 100644
--- a/gdb-8.0.1/gdb/features/arm/arm-with-vfpv3.xml
+++ b/gdb-8.0.1/gdb/features/arm/arm-with-vfpv3.xml
@@ -8,6 +8,7 @@
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
   <architecture>arm</architecture>
+  <osabi>GNU/Linux</osabi>
   <xi:include href="arm-core.xml"/>
   <xi:include href="arm-vfpv3.xml"/>
 </target>