From 5cbd102d129983cb3a85d41f3606d12584eb75a7 Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Wed, 30 Mar 2016 18:17:50 -0700
Subject: Specify osabi in arm/aarch64 tdescs.

Upstream probably won't like this. Presumably, the correct fix is to add
a new -linux version of each of these.

Bug: http://b/27926981
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=19895
Change-Id: I1eb1d821b027e18c152f025768e2c4d24f3d2729
---
 gdb-7.11/gdb/features/aarch64.c           | 2 ++
 gdb-7.11/gdb/features/aarch64.xml         | 1 +
 gdb-7.11/gdb/features/arm-with-iwmmxt.c   | 2 ++
 gdb-7.11/gdb/features/arm-with-iwmmxt.xml | 1 +
 gdb-7.11/gdb/features/arm-with-neon.c     | 2 ++
 gdb-7.11/gdb/features/arm-with-neon.xml   | 1 +
 gdb-7.11/gdb/features/arm-with-vfpv2.c    | 2 ++
 gdb-7.11/gdb/features/arm-with-vfpv2.xml  | 1 +
 gdb-7.11/gdb/features/arm-with-vfpv3.c    | 2 ++
 gdb-7.11/gdb/features/arm-with-vfpv3.xml  | 1 +
 10 files changed, 15 insertions(+)

diff --git a/gdb-7.11/gdb/features/aarch64.c b/gdb-7.11/gdb/features/aarch64.c
index 1e9a99d3e..fda827171 100644
--- a/gdb-7.11/gdb/features/aarch64.c
+++ b/gdb-7.11/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");
   tdesc_create_reg (feature, "x0", 0, 1, NULL, 64, "int");
   tdesc_create_reg (feature, "x1", 1, 1, NULL, 64, "int");
diff --git a/gdb-7.11/gdb/features/aarch64.xml b/gdb-7.11/gdb/features/aarch64.xml
index 4f4542c53..fc76876bc 100644
--- a/gdb-7.11/gdb/features/aarch64.xml
+++ b/gdb-7.11/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-7.11/gdb/features/arm-with-iwmmxt.c b/gdb-7.11/gdb/features/arm-with-iwmmxt.c
index 1770e03e1..e1f5824cb 100644
--- a/gdb-7.11/gdb/features/arm-with-iwmmxt.c
+++ b/gdb-7.11/gdb/features/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-7.11/gdb/features/arm-with-iwmmxt.xml b/gdb-7.11/gdb/features/arm-with-iwmmxt.xml
index 2856eb51f..2a96dd569 100644
--- a/gdb-7.11/gdb/features/arm-with-iwmmxt.xml
+++ b/gdb-7.11/gdb/features/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-7.11/gdb/features/arm-with-neon.c b/gdb-7.11/gdb/features/arm-with-neon.c
index d365c0fd3..f1ba2633a 100644
--- a/gdb-7.11/gdb/features/arm-with-neon.c
+++ b/gdb-7.11/gdb/features/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-7.11/gdb/features/arm-with-neon.xml b/gdb-7.11/gdb/features/arm-with-neon.xml
index 7045b0200..53b829404 100644
--- a/gdb-7.11/gdb/features/arm-with-neon.xml
+++ b/gdb-7.11/gdb/features/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-7.11/gdb/features/arm-with-vfpv2.c b/gdb-7.11/gdb/features/arm-with-vfpv2.c
index 0ebbfef6e..e36eaf366 100644
--- a/gdb-7.11/gdb/features/arm-with-vfpv2.c
+++ b/gdb-7.11/gdb/features/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-7.11/gdb/features/arm-with-vfpv2.xml b/gdb-7.11/gdb/features/arm-with-vfpv2.xml
index f9dc84f5d..a8d45b932 100644
--- a/gdb-7.11/gdb/features/arm-with-vfpv2.xml
+++ b/gdb-7.11/gdb/features/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-7.11/gdb/features/arm-with-vfpv3.c b/gdb-7.11/gdb/features/arm-with-vfpv3.c
index e235dfa76..6455beae5 100644
--- a/gdb-7.11/gdb/features/arm-with-vfpv3.c
+++ b/gdb-7.11/gdb/features/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-7.11/gdb/features/arm-with-vfpv3.xml b/gdb-7.11/gdb/features/arm-with-vfpv3.xml
index 12ccb4afd..046c0575f 100644
--- a/gdb-7.11/gdb/features/arm-with-vfpv3.xml
+++ b/gdb-7.11/gdb/features/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>
-- 
cgit v1.2.3