From owner-svn-src-all@FreeBSD.ORG Sat May 3 16:08:53 2014 Return-Path: Delivered-To: svn-src-all@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 7BC3F5A7; Sat, 3 May 2014 16:08:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 5C30819EC; Sat, 3 May 2014 16:08:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s43G8rGV036284; Sat, 3 May 2014 16:08:53 GMT (envelope-from markj@svn.freebsd.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s43G8qIK036279; Sat, 3 May 2014 16:08:52 GMT (envelope-from markj@svn.freebsd.org) Message-Id: <201405031608.s43G8qIK036279@svn.freebsd.org> From: Mark Johnston Date: Sat, 3 May 2014 16:08:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r265273 - in stable/10: 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/dt... X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 May 2014 16:08:53 -0000 Author: markj Date: Sat May 3 16:08:52 2014 New Revision: 265273 URL: http://svnweb.freebsd.org/changeset/base/265273 Log: MFC r262542: Move some files that are identical on i386 and amd64 to an x86 subdirectory rather than keeping duplicate copies. Added: stable/10/sys/cddl/dev/dtrace/x86/ - copied from r262542, head/sys/cddl/dev/dtrace/x86/ Deleted: stable/10/sys/cddl/dev/dtrace/amd64/dis_tables.c stable/10/sys/cddl/dev/dtrace/amd64/dis_tables.h stable/10/sys/cddl/dev/dtrace/amd64/regset.h stable/10/sys/cddl/dev/dtrace/i386/dis_tables.c stable/10/sys/cddl/dev/dtrace/i386/dis_tables.h stable/10/sys/cddl/dev/dtrace/i386/regset.h Modified: stable/10/cddl/lib/libdtrace/Makefile stable/10/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c stable/10/sys/modules/dtrace/dtrace/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/cddl/lib/libdtrace/Makefile ============================================================================== --- stable/10/cddl/lib/libdtrace/Makefile Sat May 3 15:57:12 2014 (r265272) +++ stable/10/cddl/lib/libdtrace/Makefile Sat May 3 16:08:52 2014 (r265273) @@ -69,9 +69,11 @@ CFLAGS+= -I${.OBJDIR} -I${.CURDIR} \ #CFLAGS+= -DYYDEBUG .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/dev/dtrace/x86 CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel -DDIS_MEM .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/i386 .PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/x86 .elif ${MACHINE_CPUARCH} == "sparc64" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/sparc Modified: stable/10/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c Sat May 3 15:57:12 2014 (r265272) +++ stable/10/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c Sat May 3 16:08:52 2014 (r265273) @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include #include Modified: stable/10/sys/modules/dtrace/dtrace/Makefile ============================================================================== --- stable/10/sys/modules/dtrace/dtrace/Makefile Sat May 3 15:57:12 2014 (r265272) +++ stable/10/sys/modules/dtrace/dtrace/Makefile Sat May 3 16:08:52 2014 (r265273) @@ -14,9 +14,11 @@ SRCS= dtrace.c \ dtrace_subr.c .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +.PATH: ${.CURDIR}/../../../cddl/dev/dtrace/x86 SRCS+= dis_tables.c \ instr_size.c -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel \ + -I${.CURDIR}/../../../cddl/dev/dtrace/x86 .endif SRCS+= bus_if.h device_if.h vnode_if.h