From owner-svn-src-head@FreeBSD.ORG Sat Mar 1 16:06:52 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CAFA3A2; Sat, 1 Mar 2014 16:06:52 +0000 (UTC) Received: from mail-ie0-x22c.google.com (mail-ie0-x22c.google.com [IPv6:2607:f8b0:4001:c03::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 75F4C16FC; Sat, 1 Mar 2014 16:06:52 +0000 (UTC) Received: by mail-ie0-f172.google.com with SMTP id as1so4150131iec.17 for ; Sat, 01 Mar 2014 08:06:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=5LJSXkZy60JAMQyWAddDlVjeOSZ1H9YI1S7PQMJFrZ4=; b=IcDm0pgNIhzTQm1VgnPAuvstcf8YHSjjyiwOJs6ggrt2+tvf1hn2d/900Xkgg6Dt4T FsTmjf889YleL8or/qM+OoqKU8Dy4/i10ayd3mu+1dI2UEoDkq1432IUQWGlcpxJAYTB pd2aAPoqk0aHLiL5WrrxNzgQKXk8p814Q6mzR/cs5YWlHThTp5r4cblgn6iocOgmA3n9 9sUq2ljJdjhdpjbk3V0JGQvu7GMfOUUuLiUnAEHX3/AfNHY+mhrbB9VHz1gEMTMVjxKo oTUntiiDdNd3voddJaEwhsXWVX0SF/Z2SfObcY5iuglL/5dqzogqd8WYE7BIcH5yXvj3 oFNw== X-Received: by 10.42.65.73 with SMTP id k9mr17636755ici.44.1393690011839; Sat, 01 Mar 2014 08:06:51 -0800 (PST) Received: from raichu (198-84-185-216.cpe.teksavvy.com. [198.84.185.216]) by mx.google.com with ESMTPSA id v2sm19193179igk.7.2014.03.01.08.06.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Mar 2014 08:06:51 -0800 (PST) Sender: Mark Johnston Date: Sat, 1 Mar 2014 11:06:48 -0500 From: Mark Johnston To: src-committers@freebsd.org Subject: Re: svn commit: r262542 - in head: cddl/lib/libdtrace sys/cddl/contrib/opensolaris/uts/intel/dtrace sys/cddl/dev/dtrace/amd64 sys/cddl/dev/dtrace/i386 sys/cddl/dev/dtrace/x86 sys/modules/dtrace/dtrace Message-ID: <20140301160648.GB97155@raichu> References: <201402270104.s1R14ZCB007699@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201402270104.s1R14ZCB007699@svn.freebsd.org> User-Agent: Mutt/1.5.22 (2013-10-16) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, lwhsu@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Mar 2014 16:06:52 -0000 On Thu, Feb 27, 2014 at 01:04:35AM +0000, Mark Johnston wrote: > Author: markj > Date: Thu Feb 27 01:04:35 2014 > New Revision: 262542 > URL: http://svnweb.freebsd.org/changeset/base/262542 > > Log: > Move some files that are identical on i386 and amd64 to an x86 subdirectory > rather than keeping duplicate copies. > > Discussed with: avg > MFC after: 1 week > > Added: > head/sys/cddl/dev/dtrace/x86/ > head/sys/cddl/dev/dtrace/x86/dis_tables.c > - copied unchanged from r262521, head/sys/cddl/dev/dtrace/amd64/dis_tables.c > head/sys/cddl/dev/dtrace/x86/dis_tables.h > - copied unchanged from r262521, head/sys/cddl/dev/dtrace/amd64/dis_tables.h > head/sys/cddl/dev/dtrace/x86/regset.h > - copied unchanged from r262521, head/sys/cddl/dev/dtrace/amd64/regset.h > Deleted: > head/sys/cddl/dev/dtrace/amd64/dis_tables.c > head/sys/cddl/dev/dtrace/amd64/dis_tables.h > head/sys/cddl/dev/dtrace/amd64/regset.h > head/sys/cddl/dev/dtrace/i386/dis_tables.c > head/sys/cddl/dev/dtrace/i386/dis_tables.h > head/sys/cddl/dev/dtrace/i386/regset.h > Modified: > head/cddl/lib/libdtrace/Makefile > head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c > head/sys/modules/dtrace/dtrace/Makefile This appears to have broken the ability to build dtrace.ko from sys/modules/dtrace/dtrace since I've added a file named "x86" to make's search path. Then kmod.mk decides that it doesn't need to create a symlink to sys/x86/include in the object directory, which breaks the build. The patch here fixes the problem by using an explicit path to the symlink. Would anyone be able to review it? http://people.freebsd.org/~lwhsu/patch/kmod.mk.diff Thanks, -Mark