Author: imp Date: Sun Jun 13 01:27:29 2010 New Revision: 209118 URL: http://svn.freebsd.org/changeset/base/209118
Log: Merge from tbemd: Convert from using MACHINE_ARCH to MACHINE_CPUARCH. Hoist path statement up into the top Makefile rather than repeating it on every arch Makefile. Modified: head/lib/libkse/Makefile head/lib/libkse/arch/amd64/Makefile.inc head/lib/libkse/arch/arm/Makefile.inc head/lib/libkse/arch/i386/Makefile.inc head/lib/libkse/arch/ia64/Makefile.inc head/lib/libkse/arch/powerpc/Makefile.inc head/lib/libkse/arch/sparc64/Makefile.inc head/lib/libkse/support/Makefile.inc Modified: head/lib/libkse/Makefile ============================================================================== --- head/lib/libkse/Makefile Sun Jun 13 01:13:36 2010 (r209117) +++ head/lib/libkse/Makefile Sun Jun 13 01:27:29 2010 (r209118) @@ -15,10 +15,10 @@ SHLIB_MAJOR= 4 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include -CFLAGS+=-I${.CURDIR}/arch/${MACHINE_ARCH}/include +CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include CFLAGS+=-I${.CURDIR}/sys CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf -CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} +CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPUARCH} CFLAGS+=-fno-builtin # Uncomment this if you want libkse to contain debug information for @@ -38,7 +38,9 @@ SYMBOL_MAPS=${.CURDIR}/kse.map PRECIOUSLIB= -.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" +.path: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} + +.include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc" .include "${.CURDIR}/support/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" Modified: head/lib/libkse/arch/amd64/Makefile.inc ============================================================================== --- head/lib/libkse/arch/amd64/Makefile.inc Sun Jun 13 01:13:36 2010 (r209117) +++ head/lib/libkse/arch/amd64/Makefile.inc Sun Jun 13 01:27:29 2010 (r209118) @@ -1,5 +1,3 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} - SRCS+= context.S enter_uts.S pthread_md.c Modified: head/lib/libkse/arch/arm/Makefile.inc ============================================================================== --- head/lib/libkse/arch/arm/Makefile.inc Sun Jun 13 01:13:36 2010 (r209117) +++ head/lib/libkse/arch/arm/Makefile.inc Sun Jun 13 01:27:29 2010 (r209118) @@ -1,7 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} - CFLAGS+=-DSYSTEM_SCOPE_ONLY SRCS+= pthread_md.c context.S Modified: head/lib/libkse/arch/i386/Makefile.inc ============================================================================== --- head/lib/libkse/arch/i386/Makefile.inc Sun Jun 13 01:13:36 2010 (r209117) +++ head/lib/libkse/arch/i386/Makefile.inc Sun Jun 13 01:27:29 2010 (r209118) @@ -1,5 +1,3 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} - SRCS+= thr_enter_uts.S thr_getcontext.S pthread_md.c Modified: head/lib/libkse/arch/ia64/Makefile.inc ============================================================================== --- head/lib/libkse/arch/ia64/Makefile.inc Sun Jun 13 01:13:36 2010 (r209117) +++ head/lib/libkse/arch/ia64/Makefile.inc Sun Jun 13 01:27:29 2010 (r209118) @@ -1,5 +1,3 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} - SRCS+= context.S enter_uts.S pthread_md.c Modified: head/lib/libkse/arch/powerpc/Makefile.inc ============================================================================== --- head/lib/libkse/arch/powerpc/Makefile.inc Sun Jun 13 01:13:36 2010 (r209117) +++ head/lib/libkse/arch/powerpc/Makefile.inc Sun Jun 13 01:27:29 2010 (r209118) @@ -3,6 +3,4 @@ # XXX temporary CFLAGS+=-DSYSTEM_SCOPE_ONLY -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} - SRCS+= enter_uts.S context.S pthread_md.c Modified: head/lib/libkse/arch/sparc64/Makefile.inc ============================================================================== --- head/lib/libkse/arch/sparc64/Makefile.inc Sun Jun 13 01:13:36 2010 (r209117) +++ head/lib/libkse/arch/sparc64/Makefile.inc Sun Jun 13 01:27:29 2010 (r209118) @@ -1,5 +1,3 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} - SRCS+= pthread_md.c thr_getcontext.S Modified: head/lib/libkse/support/Makefile.inc ============================================================================== --- head/lib/libkse/support/Makefile.inc Sun Jun 13 01:13:36 2010 (r209117) +++ head/lib/libkse/support/Makefile.inc Sun Jun 13 01:27:29 2010 (r209118) @@ -1,9 +1,9 @@ # $FreeBSD$ .PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys +.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys -CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_CPUARCH} SYSCALLS= clock_gettime \ kse_create \ _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"