From owner-svn-src-head@freebsd.org  Wed Feb 22 04:35:09 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31952CE98B4;
 Wed, 22 Feb 2017 04:35:09 +0000 (UTC)
 (envelope-from badger@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 00FE51CD0;
 Wed, 22 Feb 2017 04:35:08 +0000 (UTC)
 (envelope-from badger@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1M4Z8qJ059728;
 Wed, 22 Feb 2017 04:35:08 GMT (envelope-from badger@FreeBSD.org)
Received: (from badger@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1M4Z8iT059727;
 Wed, 22 Feb 2017 04:35:08 GMT (envelope-from badger@FreeBSD.org)
Message-Id: <201702220435.v1M4Z8iT059727@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: badger set sender to
 badger@FreeBSD.org using -f
From: Eric Badger <badger@FreeBSD.org>
Date: Wed, 22 Feb 2017 04:35:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314075 - head/tests/sys/kern
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Feb 2017 04:35:09 -0000

Author: badger
Date: Wed Feb 22 04:35:07 2017
New Revision: 314075
URL: https://svnweb.freebsd.org/changeset/base/314075

Log:
  Fix world build for archs where __builtin_debugtrap() does not work.
  
  The offending code was introduced in r313992.
  
  Reported by:	rpokala
  Approved by:	kib (mentor)

Modified:
  head/tests/sys/kern/ptrace_test.c

Modified: head/tests/sys/kern/ptrace_test.c
==============================================================================
--- head/tests/sys/kern/ptrace_test.c	Wed Feb 22 04:28:10 2017	(r314074)
+++ head/tests/sys/kern/ptrace_test.c	Wed Feb 22 04:35:07 2017	(r314075)
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/user.h>
 #include <sys/wait.h>
 #include <errno.h>
+#include <machine/cpufunc.h>
 #include <pthread.h>
 #include <semaphore.h>
 #include <signal.h>
@@ -1690,7 +1691,7 @@ ATF_TC_BODY(ptrace__PT_KILL_breakpoint, 
 	ATF_REQUIRE((fpid = fork()) != -1);
 	if (fpid == 0) {
 		trace_me();
-		__builtin_debugtrap();
+		breakpoint();
 		exit(1);
 	}