--- a/components/gdb/patches/gdb.features.sparc-cp0.c.patch	Wed Dec 07 10:59:52 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- /dev/null	2013-10-05 19:42:45.000000000 -0700
-+++ gdb-7.6/gdb/features/sparc-cp0.c	2013-08-28 00:21:38.000000000 -0700
-@@ -0,0 +1,16 @@
-+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
-+  Original: sparc-cp0.xml */
-+
-+#include "defs.h"
-+#include "osabi.h"
-+#include "target-descriptions.h"
-+
-+struct target_desc *tdesc_sparc_cp0;
-+static void
-+initialize_tdesc_sparc_cp0 (void)
-+{
-+  struct target_desc *result = allocate_target_description ();
-+  struct tdesc_feature *feature;
-+
-+  tdesc_sparc_cp0 = result;
-+}

--- a/components/gdb/patches/gdb.features.sparc-cpu.c.patch	Wed Dec 07 10:59:52 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- /dev/null	2013-10-05 19:42:45.000000000 -0700
-+++ gdb-7.6/gdb/features/sparc-cpu.c	2013-08-28 00:21:38.000000000 -0700
-@@ -0,0 +1,16 @@
-+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
-+  Original: sparc-cpu.xml */
-+
-+#include "defs.h"
-+#include "osabi.h"
-+#include "target-descriptions.h"
-+
-+struct target_desc *tdesc_sparc_cpu;
-+static void
-+initialize_tdesc_sparc_cpu (void)
-+{
-+  struct target_desc *result = allocate_target_description ();
-+  struct tdesc_feature *feature;
-+
-+  tdesc_sparc_cpu = result;
-+}

--- a/components/gdb/patches/gdb.features.sparc-fpu.c.patch	Wed Dec 07 10:59:52 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- /dev/null	2013-10-05 19:42:45.000000000 -0700
-+++ gdb-7.6/gdb/features/sparc-fpu.c	2013-08-28 00:21:38.000000000 -0700
-@@ -0,0 +1,16 @@
-+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
-+  Original: sparc-fpu.xml */
-+
-+#include "defs.h"
-+#include "osabi.h"
-+#include "target-descriptions.h"
-+
-+struct target_desc *tdesc_sparc_fpu;
-+static void
-+initialize_tdesc_sparc_fpu (void)
-+{
-+  struct target_desc *result = allocate_target_description ();
-+  struct tdesc_feature *feature;
-+
-+  tdesc_sparc_fpu = result;
-+}

--- a/components/gdb/patches/gdb.features.sparc64-cp0.c.patch	Wed Dec 07 10:59:52 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- /dev/null	2013-10-05 19:42:45.000000000 -0700
-+++ gdb-7.6/gdb/features/sparc64-cp0.c	2013-08-28 00:21:38.000000000 -0700
-@@ -0,0 +1,16 @@
-+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
-+  Original: sparc64-cp0.xml */
-+
-+#include "defs.h"
-+#include "osabi.h"
-+#include "target-descriptions.h"
-+
-+struct target_desc *tdesc_sparc64_cp0;
-+static void
-+initialize_tdesc_sparc64_cp0 (void)
-+{
-+  struct target_desc *result = allocate_target_description ();
-+  struct tdesc_feature *feature;
-+
-+  tdesc_sparc64_cp0 = result;
-+}

--- a/components/gdb/patches/gdb.features.sparc64-cp0.xml.patch	Wed Dec 07 10:59:52 2016 -0800
+++ b/components/gdb/patches/gdb.features.sparc64-cp0.xml.patch	Mon Dec 05 14:40:11 2016 -0800
@@ -1,7 +1,7 @@
 # XML representation of 64-bit SPARC control registers.
 --- /dev/null	2013-10-05 19:42:45.000000000 -0700
 +++ gdb-7.6/gdb/features/sparc64-cp0.xml	2013-08-28 00:21:25.000000000 -0700
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,17 @@
 +<?xml version="1.0"?>
 +<!-- Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
 +
@@ -17,8 +17,5 @@
 +  <reg name="fsr" bitsize="32" type="ieee_single" regnum="83"/>
 +  <reg name="fprs" bitsize="32" type="ieee_single" regnum="84"/>
 +  <reg name="y" bitsize="64" type="uint64" regnum="85"/>
-+  <reg name="cwp" bitsize="64" type="uint64" regnum="86"/>
-+  <reg name="pstate" bitsize="64" type="uint64" regnum="87"/>
-+  <reg name="asi" bitsize="64" type="uint64" regnum="88"/>
 +</feature>
 +

--- a/components/gdb/patches/gdb.features.sparc64-cpu.c.patch	Wed Dec 07 10:59:52 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- /dev/null	2013-10-05 19:42:45.000000000 -0700
-+++ gdb-7.6/gdb/features/sparc64-cpu.c	2013-08-28 00:21:38.000000000 -0700
-@@ -0,0 +1,16 @@
-+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
-+  Original: sparc64-cpu.xml */
-+
-+#include "defs.h"
-+#include "osabi.h"
-+#include "target-descriptions.h"
-+
-+struct target_desc *tdesc_sparc64_cpu;
-+static void
-+initialize_tdesc_sparc64_cpu (void)
-+{
-+  struct target_desc *result = allocate_target_description ();
-+  struct tdesc_feature *feature;
-+
-+  tdesc_sparc64_cpu = result;
-+}

--- a/components/gdb/patches/gdb.features.sparc64-fpu.c.patch	Wed Dec 07 10:59:52 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- /dev/null	2013-10-05 19:42:45.000000000 -0700
-+++ gdb-7.6/gdb/features/sparc64-fpu.c	2013-08-28 00:21:38.000000000 -0700
-@@ -0,0 +1,16 @@
-+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
-+  Original: sparc64-fpu.xml */
-+
-+#include "defs.h"
-+#include "osabi.h"
-+#include "target-descriptions.h"
-+
-+struct target_desc *tdesc_sparc64_fpu;
-+static void
-+initialize_tdesc_sparc64_fpu (void)
-+{
-+  struct target_desc *result = allocate_target_description ();
-+  struct tdesc_feature *feature;
-+
-+  tdesc_sparc64_fpu = result;
-+}

--- a/components/gdb/patches/gdb.features.sparc64-fpu.xml.patch	Wed Dec 07 10:59:52 2016 -0800
+++ b/components/gdb/patches/gdb.features.sparc64-fpu.xml.patch	Mon Dec 05 14:40:11 2016 -0800
@@ -1,9 +1,9 @@
 # XML representation of 64-bit SPARC floating-point registers.
 --- /dev/null	2013-10-05 19:42:45.000000000 -0700
 +++ gdb-7.6/gdb/features/sparc64-fpu.xml	2013-08-28 00:21:33.000000000 -0700
-@@ -0,0 +1,93 @@
+@@ -0,0 +1,60 @@
 +<?xml version="1.0"?>
-+<!-- Copyright (C) 2007-2013 Free Software Foundation, Inc.
++<!-- Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 +
 +     Copying and distribution of this file, with or without modification,
 +     are permitted in any medium without royalty provided the copyright
@@ -44,54 +44,21 @@
 +  <reg name="f30" bitsize="32" type="ieee_single" regnum="62"/>
 +  <reg name="f31" bitsize="32" type="ieee_single" regnum="63"/>
 +
-+  <reg name="d0" bitsize="64" type="ieee_double" regnum="32"/>
-+  <reg name="d1" bitsize="64" type="ieee_double" regnum="34"/>
-+  <reg name="d2" bitsize="64" type="ieee_double" regnum="36"/>
-+  <reg name="d3" bitsize="64" type="ieee_double" regnum="38"/>
-+  <reg name="d4" bitsize="64" type="ieee_double" regnum="40"/>
-+  <reg name="d5" bitsize="64" type="ieee_double" regnum="42"/>
-+  <reg name="d6" bitsize="64" type="ieee_double" regnum="44"/>
-+  <reg name="d7" bitsize="64" type="ieee_double" regnum="46"/>
-+  <reg name="d8" bitsize="64" type="ieee_double" regnum="48"/>
-+  <reg name="d9" bitsize="64" type="ieee_double" regnum="50"/>
-+  <reg name="d10" bitsize="64" type="ieee_double" regnum="52"/>
-+  <reg name="d11" bitsize="64" type="ieee_double" regnum="54"/>
-+  <reg name="d12" bitsize="64" type="ieee_double" regnum="56"/>
-+  <reg name="d13" bitsize="64" type="ieee_double" regnum="58"/>
-+  <reg name="d14" bitsize="64" type="ieee_double" regnum="60"/>
-+  <reg name="d15" bitsize="64" type="ieee_double" regnum="62"/>
-+  <reg name="d16" bitsize="64" type="ieee_double" regnum="64"/>
-+  <reg name="d17" bitsize="64" type="ieee_double" regnum="66"/>
-+  <reg name="d18" bitsize="64" type="ieee_double" regnum="68"/>
-+  <reg name="d19" bitsize="64" type="ieee_double" regnum="70"/>
-+  <reg name="d20" bitsize="64" type="ieee_double" regnum="72"/>
-+  <reg name="d21" bitsize="64" type="ieee_double" regnum="74"/>
-+  <reg name="d22" bitsize="64" type="ieee_double" regnum="76"/>
-+  <reg name="d23" bitsize="64" type="ieee_double" regnum="78"/>
-+  <reg name="d24" bitsize="64" type="ieee_double" regnum="80"/>
-+  <reg name="d25" bitsize="64" type="ieee_double" regnum="82"/>
-+  <reg name="d26" bitsize="64" type="ieee_double" regnum="84"/>
-+  <reg name="d27" bitsize="64" type="ieee_double" regnum="86"/>
-+  <reg name="d28" bitsize="64" type="ieee_double" regnum="88"/>
-+  <reg name="d29" bitsize="64" type="ieee_double" regnum="90"/>
-+  <reg name="d30" bitsize="64" type="ieee_double" regnum="92"/>
-+  <reg name="d31" bitsize="64" type="ieee_double" regnum="94"/>
-+
-+  <reg name="q0" bitsize="128" type="ieee_double" regnum="32"/>
-+  <reg name="q1" bitsize="128" type="ieee_double" regnum="36"/>
-+  <reg name="q2" bitsize="128" type="ieee_double" regnum="40"/>
-+  <reg name="q3" bitsize="128" type="ieee_double" regnum="44"/>
-+  <reg name="q4" bitsize="128" type="ieee_double" regnum="48"/>
-+  <reg name="q5" bitsize="128" type="ieee_double" regnum="52"/>
-+  <reg name="q6" bitsize="128" type="ieee_double" regnum="56"/>
-+  <reg name="q7" bitsize="128" type="ieee_double" regnum="62"/>
-+  <reg name="q8" bitsize="128" type="ieee_double" regnum="66"/>
-+  <reg name="q9" bitsize="128" type="ieee_double" regnum="70"/>
-+  <reg name="q10" bitsize="128" type="ieee_double" regnum="74"/>
-+  <reg name="q11" bitsize="128" type="ieee_double" regnum="78"/>
-+  <reg name="q12" bitsize="128" type="ieee_double" regnum="80"/>
-+  <reg name="q13" bitsize="128" type="ieee_double" regnum="80"/>
-+  <reg name="q14" bitsize="128" type="ieee_double" regnum="80"/>
-+  <reg name="q15" bitsize="128" type="ieee_double" regnum="80"/>
++  <reg name="f32" bitsize="64" type="ieee_double" regnum="64"/>
++  <reg name="f34" bitsize="64" type="ieee_double" regnum="65"/>
++  <reg name="f36" bitsize="64" type="ieee_double" regnum="66"/>
++  <reg name="f38" bitsize="64" type="ieee_double" regnum="67"/>
++  <reg name="f40" bitsize="64" type="ieee_double" regnum="68"/>
++  <reg name="f42" bitsize="64" type="ieee_double" regnum="69"/>
++  <reg name="f44" bitsize="64" type="ieee_double" regnum="70"/>
++  <reg name="f46" bitsize="64" type="ieee_double" regnum="71"/>
++  <reg name="f48" bitsize="64" type="ieee_double" regnum="72"/>
++  <reg name="f50" bitsize="64" type="ieee_double" regnum="73"/>
++  <reg name="f52" bitsize="64" type="ieee_double" regnum="74"/>
++  <reg name="f54" bitsize="64" type="ieee_double" regnum="75"/>
++  <reg name="f56" bitsize="64" type="ieee_double" regnum="76"/>
++  <reg name="f58" bitsize="64" type="ieee_double" regnum="77"/>
++  <reg name="f60" bitsize="64" type="ieee_double" regnum="78"/>
++  <reg name="f62" bitsize="64" type="ieee_double" regnum="79"/>
 +</feature>
 +

--- a/components/gdb/patches/gdb.features.sparc64-solaris.c.patch	Wed Dec 07 10:59:52 2016 -0800
+++ b/components/gdb/patches/gdb.features.sparc64-solaris.c.patch	Mon Dec 05 14:40:11 2016 -0800
@@ -1,6 +1,6 @@
 --- /dev/null	2013-10-05 19:42:45.000000000 -0700
 +++ gdb-7.6/gdb/features/sparc64-solaris.c	2013-08-28 00:21:38.000000000 -0700
-@@ -0,0 +1,150 @@
+@@ -0,0 +1,115 @@
 +/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
 +  Original: sparc64-solaris.xml */
 +
@@ -60,9 +60,6 @@
 +  tdesc_create_reg (feature, "fsr", 83, 1, NULL, 32, "ieee_single");
 +  tdesc_create_reg (feature, "fprs", 84, 1, NULL, 32, "ieee_single");
 +  tdesc_create_reg (feature, "y", 85, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "cwp", 86, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "pstate", 87, 1, NULL, 64, "uint64");
-+  tdesc_create_reg (feature, "asi", 88, 1, NULL, 64, "uint64");
 +
 +  feature = tdesc_create_feature (result, "org.gnu.gdb.sparc.fpu");
 +  tdesc_create_reg (feature, "f0", 32, 1, NULL, 32, "ieee_single");
@@ -97,57 +94,25 @@
 +  tdesc_create_reg (feature, "f29", 61, 1, NULL, 32, "ieee_single");
 +  tdesc_create_reg (feature, "f30", 62, 1, NULL, 32, "ieee_single");
 +  tdesc_create_reg (feature, "f31", 63, 1, NULL, 32, "ieee_single");
-+  tdesc_create_reg (feature, "d0", 32, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d1", 34, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d2", 36, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d3", 38, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d4", 40, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d5", 42, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d6", 44, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d7", 46, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d8", 48, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d9", 50, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d10", 52, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d11", 54, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d12", 56, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d13", 58, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d14", 60, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d15", 62, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d16", 64, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d17", 66, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d18", 68, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d19", 70, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d20", 72, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d21", 74, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d22", 76, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d23", 78, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d24", 80, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d25", 82, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d26", 84, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d27", 86, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d28", 88, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d29", 90, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d30", 92, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "d31", 94, 1, NULL, 64, "ieee_double");
-+  tdesc_create_reg (feature, "q0", 32, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q1", 36, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q2", 40, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q3", 44, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q4", 48, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q5", 52, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q6", 56, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q7", 62, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q8", 66, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q9", 70, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q10", 74, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q11", 78, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q12", 80, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q13", 80, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q14", 80, 1, NULL, 128, "ieee_double");
-+  tdesc_create_reg (feature, "q15", 80, 1, NULL, 128, "ieee_double");
++  tdesc_create_reg (feature, "f32", 64, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f34", 65, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f36", 66, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f38", 67, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f40", 68, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f42", 69, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f44", 70, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f46", 71, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f48", 72, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f50", 73, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f52", 74, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f54", 75, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f56", 76, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f58", 77, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f60", 78, 1, NULL, 64, "ieee_double");
++  tdesc_create_reg (feature, "f62", 79, 1, NULL, 64, "ieee_double");
 +
 +  feature = tdesc_create_feature (result, "org.gnu.gdb.sparc.solaris");
-+  tdesc_create_reg (feature, "restart", 81, 1, "system", 64, "int");
++  tdesc_create_reg (feature, "restart", 86, 1, "system", 64, "int");
 +
 +  tdesc_sparc64_solaris = result;
 +}

--- a/components/gdb/patches/gdb.features.sparc64-solaris.xml.patch	Wed Dec 07 10:59:52 2016 -0800
+++ b/components/gdb/patches/gdb.features.sparc64-solaris.xml.patch	Mon Dec 05 14:40:11 2016 -0800
@@ -18,6 +18,6 @@
 +  <xi:include href="sparc64-fpu.xml"/>
 +
 +  <feature name="org.gnu.gdb.sparc.solaris">
-+    <reg name="restart" bitsize="64" group="system"/>
++    <reg name="restart" bitsize="64" group="system" regname="86"/>
 +  </feature>
 +</target>