From owner-svn-src-head@freebsd.org  Thu Feb 23 04:06:02 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 00B5ECE94AE
 for <svn-src-head@mailman.ysv.freebsd.org>;
 Thu, 23 Feb 2017 04:06:02 +0000 (UTC) (envelope-from ian@freebsd.org)
Received: from outbound1b.ore.mailhop.org (outbound1b.ore.mailhop.org
 [54.200.247.200])
 (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 DA45EB53
 for <svn-src-head@freebsd.org>; Thu, 23 Feb 2017 04:06:01 +0000 (UTC)
 (envelope-from ian@freebsd.org)
X-MHO-User: 6c040dca-f97d-11e6-ba57-8bc134ee460a
X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information
X-Originating-IP: 73.78.92.27
X-Mail-Handler: DuoCircle Outbound SMTP
Received: from ilsoft.org (unknown [73.78.92.27])
 by outbound1.ore.mailhop.org (Halon) with ESMTPSA
 id 6c040dca-f97d-11e6-ba57-8bc134ee460a;
 Thu, 23 Feb 2017 04:06:16 +0000 (UTC)
Received: from rev (rev [172.22.42.240])
 by ilsoft.org (8.15.2/8.15.2) with ESMTP id v1N45q1M009163;
 Wed, 22 Feb 2017 21:05:52 -0700 (MST) (envelope-from ian@freebsd.org)
Message-ID: <1487822752.25520.2.camel@freebsd.org>
Subject: Re: svn commit: r314075 - head/tests/sys/kern
From: Ian Lepore <ian@freebsd.org>
To: Eric Badger <badger@FreeBSD.org>, src-committers@freebsd.org,
 svn-src-all@freebsd.org, svn-src-head@freebsd.org
Date: Wed, 22 Feb 2017 21:05:52 -0700
In-Reply-To: <201702220435.v1M4Z8iT059727@repo.freebsd.org>
References: <201702220435.v1M4Z8iT059727@repo.freebsd.org>
Content-Type: text/plain; charset="ISO-8859-1"
X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port 
Mime-Version: 1.0
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: Thu, 23 Feb 2017 04:06:02 -0000

On Wed, 2017-02-22 at 04:35 +0000, Eric Badger wrote:
> 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);
>  	}
>  
> 

This fixes only x86 and sparc64.  All other arches have breakpoint()
under the #ifdef KERNEL wrapper (I have no idea why).  If fixing this
is going to take any longer, can we disconnect this test from the build
until it gets worked out?

-- Ian