d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from tbemd:

Browse Source 
Convert from using MACHINE_ARCH to MACHINE_CPUARCH.  Hoist path statement
up into the top Makefile rather than repeating it on every arch Makefile.
This commit is contained in:
Warner Losh 2010-06-13 01:27:29 +00:00
parent ff847ecb82
commit 4c3cf69727
8 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libkse/Makefile
View File

@ -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"

2
lib/libkse/arch/amd64/Makefile.inc
View File

@ -1,5 +1,3 @@
# $FreeBSD$
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
SRCS+= context.S enter_uts.S pthread_md.c

2
lib/libkse/arch/arm/Makefile.inc
View File

@ -1,7 +1,5 @@
# $FreeBSD$
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
CFLAGS+=-DSYSTEM_SCOPE_ONLY
SRCS+= pthread_md.c context.S

2
lib/libkse/arch/i386/Makefile.inc
View File

@ -1,5 +1,3 @@
# $FreeBSD$
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
SRCS+= thr_enter_uts.S thr_getcontext.S pthread_md.c

2
lib/libkse/arch/ia64/Makefile.inc
View File

@ -1,5 +1,3 @@
# $FreeBSD$
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
SRCS+= context.S enter_uts.S pthread_md.c

2
lib/libkse/arch/powerpc/Makefile.inc
View File

@ -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

2
lib/libkse/arch/sparc64/Makefile.inc
View File

@ -1,5 +1,3 @@
# $FreeBSD$
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
SRCS+= pthread_md.c thr_getcontext.S

4
lib/libkse/support/Makefile.inc
View File

@ -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 \