svn commit: r265274 - in stable/9: 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

[Mark Johnston]

Author: markj
Date: Sat May  3 16:09:08 2014
New Revision: 265274
URL: http://svnweb.freebsd.org/changeset/base/265274

Log:
  MFC r262542:
  Move some files that are identical on i386 and amd64 to an x86 subdirectory
  rather than keeping duplicate copies.

Added:
  stable/9/sys/cddl/dev/dtrace/x86/
     - copied from r262542, head/sys/cddl/dev/dtrace/x86/
Deleted:
  stable/9/sys/cddl/dev/dtrace/amd64/dis_tables.c
  stable/9/sys/cddl/dev/dtrace/amd64/dis_tables.h
  stable/9/sys/cddl/dev/dtrace/amd64/regset.h
  stable/9/sys/cddl/dev/dtrace/i386/dis_tables.c
  stable/9/sys/cddl/dev/dtrace/i386/dis_tables.h
  stable/9/sys/cddl/dev/dtrace/i386/regset.h
Modified:
  stable/9/cddl/lib/libdtrace/Makefile
  stable/9/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
  stable/9/sys/modules/dtrace/dtrace/Makefile
Directory Properties:
  stable/9/cddl/lib/libdtrace/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/cddl/lib/libdtrace/Makefile
==============================================================================
--- stable/9/cddl/lib/libdtrace/Makefile	Sat May  3 16:08:52 2014	(r265273)
+++ stable/9/cddl/lib/libdtrace/Makefile	Sat May  3 16:09:08 2014	(r265274)
@@ -67,9 +67,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/9/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c	Sat May  3 16:08:52 2014	(r265273)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c	Sat May  3 16:09:08 2014	(r265274)
@@ -47,7 +47,7 @@
 #include <sys/types.h>
 #include <sys/proc.h>
 #include <sys/dtrace_bsd.h>
-#include <cddl/dev/dtrace/i386/regset.h>
+#include <cddl/dev/dtrace/x86/regset.h>
 #include <machine/segments.h>
 #include <machine/reg.h>
 #include <machine/pcb.h>

Modified: stable/9/sys/modules/dtrace/dtrace/Makefile
==============================================================================
--- stable/9/sys/modules/dtrace/dtrace/Makefile	Sat May  3 16:08:52 2014	(r265273)
+++ stable/9/sys/modules/dtrace/dtrace/Makefile	Sat May  3 16:09:08 2014	(r265274)
@@ -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