From owner-svn-src-head@FreeBSD.ORG  Wed Jun  5 07:37:45 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 9CBFC285;
 Wed,  5 Jun 2013 07:37:45 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8F855192C;
 Wed,  5 Jun 2013 07:37:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r557bjHJ085375;
 Wed, 5 Jun 2013 07:37:45 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r557bj7J085374;
 Wed, 5 Jun 2013 07:37:45 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201306050737.r557bj7J085374@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 5 Jun 2013 07:37:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251405 - head/lib/libc/arm/gen
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Jun 2013 07:37:45 -0000

Author: andrew
Date: Wed Jun  5 07:37:45 2013
New Revision: 251405
URL: http://svnweb.freebsd.org/changeset/base/251405

Log:
  Remove part of the NetBSD longjmp code that was not ready to be merged.

Modified:
  head/lib/libc/arm/gen/setjmp.S

Modified: head/lib/libc/arm/gen/setjmp.S
==============================================================================
--- head/lib/libc/arm/gen/setjmp.S	Wed Jun  5 05:33:01 2013	(r251404)
+++ head/lib/libc/arm/gen/setjmp.S	Wed Jun  5 07:37:45 2013	(r251405)
@@ -78,8 +78,7 @@ ENTRY(setjmp)
 ENTRY(__longjmp)
 	ldr	r2, [r0]
 	ldr	ip, .Lsetjmp_magic
-	bic	r3, r2, #(_JB_MAGIC_SETJMP ^ _JB_MAGIC_SETJMP_VFP)
-	teq	r3, ip
+	teq	r2, ip
 	bne	.Lbotch
 
 	/* Restore the signal mask. */