--- 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>
 +