From owner-p4-projects@FreeBSD.ORG  Tue Jul 17 09:24:09 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 870591065677; Tue, 17 Jul 2012 09:24:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3EAD1106566C
	for <perforce@freebsd.org>; Tue, 17 Jul 2012 09:24:08 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 26A028FC16
	for <perforce@freebsd.org>; Tue, 17 Jul 2012 09:24:08 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q6H9O7rH039865
	for <perforce@freebsd.org>; Tue, 17 Jul 2012 09:24:07 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q6H9O7aT039862
	for perforce@freebsd.org; Tue, 17 Jul 2012 09:24:07 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 17 Jul 2012 09:24:07 GMT
Message-Id: <201207170924.q6H9O7aT039862@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 214503 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jul 2012 09:24:09 -0000

http://p4web.freebsd.org/@@214503?ac=10

Change 214503 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/07/17 09:24:03

	Back out last change -- misuse of git led to premature merging of
	one change, and lack of merging of another.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-opc.c#4 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-opc.c#4 (text+ko) ====

@@ -197,6 +197,8 @@
 {"cincbase","+w,+b,m",	0x48800001, 0xffe0003f,	0,			0,		I1	},
 {"cmove",   "+w,+b",	0x48800001, 0xffe007ff,	0,			0,		I1	},
 {"csetlen", "+w,+b,m",	0x48800000, 0xffe0003f,	0,			0,		I1	},
+{"cdeclen", "+w,+b,m",	0x48800000, 0xffe0003f,	0,			0,		I1	}, /* DEPRECATED */
+{"cdecleng","+w,+b,m",	0x48800000, 0xffe0003f,	0,			0,		I1	}, /* DEPRECATED */
 {"candperm","+w,+b,m",	0x48800006, 0xffe0003f,	0,			0,		I1	},
 {"cscr",    "+w,+b,m",	0x49200000, 0xffe0003f,	0,			0,		I1	},
 {"clcr",    "+w,+b,m",	0x49400000, 0xffe0003f,	0,			0,		I1	},