Date: Mon, 13 Sep 2010 01:58:17 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r212519 - in user/imp/tbemd: contrib/top lib/libthr lib/libthr/arch/amd64 lib/libthr/arch/arm lib/libthr/arch/i386 lib/libthr/arch/ia64 lib/libthr/arch/mips lib/libthr/arch/powerpc lib/... Message-ID: <201009130158.o8D1wHrP046364@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Sep 13 01:58:17 2010 New Revision: 212519 URL: http://svn.freebsd.org/changeset/base/212519 Log: Merge from head @r212518. Modified: user/imp/tbemd/lib/libthr/Makefile user/imp/tbemd/lib/libthr/arch/amd64/Makefile.inc user/imp/tbemd/lib/libthr/arch/arm/Makefile.inc user/imp/tbemd/lib/libthr/arch/i386/Makefile.inc user/imp/tbemd/lib/libthr/arch/ia64/Makefile.inc user/imp/tbemd/lib/libthr/arch/mips/Makefile.inc user/imp/tbemd/lib/libthr/arch/powerpc/Makefile.inc user/imp/tbemd/lib/libthr/arch/sparc64/Makefile.inc user/imp/tbemd/lib/libthr/support/Makefile.inc Directory Properties: user/imp/tbemd/ (props changed) user/imp/tbemd/cddl/contrib/opensolaris/ (props changed) user/imp/tbemd/contrib/bind9/ (props changed) user/imp/tbemd/contrib/ee/ (props changed) user/imp/tbemd/contrib/expat/ (props changed) user/imp/tbemd/contrib/file/ (props changed) user/imp/tbemd/contrib/gdb/ (props changed) user/imp/tbemd/contrib/gdtoa/ (props changed) user/imp/tbemd/contrib/gnu-sort/ (props changed) user/imp/tbemd/contrib/groff/ (props changed) user/imp/tbemd/contrib/less/ (props changed) user/imp/tbemd/contrib/libpcap/ (props changed) user/imp/tbemd/contrib/llvm/ (props changed) user/imp/tbemd/contrib/llvm/tools/clang/ (props changed) user/imp/tbemd/contrib/ncurses/ (props changed) user/imp/tbemd/contrib/netcat/ (props changed) user/imp/tbemd/contrib/ntp/ (props changed) user/imp/tbemd/contrib/one-true-awk/ (props changed) user/imp/tbemd/contrib/openbsm/ (props changed) user/imp/tbemd/contrib/openpam/ (props changed) user/imp/tbemd/contrib/pf/ (props changed) user/imp/tbemd/contrib/sendmail/ (props changed) user/imp/tbemd/contrib/tcpdump/ (props changed) user/imp/tbemd/contrib/tcsh/ (props changed) user/imp/tbemd/contrib/top/ (props changed) user/imp/tbemd/contrib/top/install-sh (props changed) user/imp/tbemd/contrib/tzcode/stdtime/ (props changed) user/imp/tbemd/contrib/tzcode/zic/ (props changed) user/imp/tbemd/contrib/tzdata/ (props changed) user/imp/tbemd/contrib/wpa/ (props changed) user/imp/tbemd/crypto/openssh/ (props changed) user/imp/tbemd/crypto/openssl/ (props changed) user/imp/tbemd/lib/libc/ (props changed) user/imp/tbemd/lib/libc/stdtime/ (props changed) user/imp/tbemd/lib/libutil/ (props changed) user/imp/tbemd/lib/libz/ (props changed) user/imp/tbemd/sbin/ (props changed) user/imp/tbemd/sbin/ipfw/ (props changed) user/imp/tbemd/share/zoneinfo/ (props changed) user/imp/tbemd/sys/ (props changed) user/imp/tbemd/sys/amd64/include/xen/ (props changed) user/imp/tbemd/sys/cddl/contrib/opensolaris/ (props changed) user/imp/tbemd/sys/contrib/dev/acpica/ (props changed) user/imp/tbemd/sys/contrib/pf/ (props changed) user/imp/tbemd/sys/contrib/x86emu/ (props changed) user/imp/tbemd/sys/dev/xen/xenpci/ (props changed) user/imp/tbemd/usr.bin/calendar/ (props changed) user/imp/tbemd/usr.bin/csup/ (props changed) user/imp/tbemd/usr.bin/procstat/ (props changed) user/imp/tbemd/usr.sbin/zic/ (props changed) Modified: user/imp/tbemd/lib/libthr/Makefile ============================================================================== --- user/imp/tbemd/lib/libthr/Makefile Mon Sep 13 01:44:56 2010 (r212518) +++ user/imp/tbemd/lib/libthr/Makefile Mon Sep 13 01:58:17 2010 (r212519) @@ -38,6 +38,8 @@ CFLAGS+=-D_PTHREADS_INVARIANTS PRECIOUSLIB= +.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} + .include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" Modified: user/imp/tbemd/lib/libthr/arch/amd64/Makefile.inc ============================================================================== --- user/imp/tbemd/lib/libthr/arch/amd64/Makefile.inc Mon Sep 13 01:44:56 2010 (r212518) +++ user/imp/tbemd/lib/libthr/arch/amd64/Makefile.inc Mon Sep 13 01:58:17 2010 (r212519) @@ -1,5 +1,3 @@ #$FreeBSD$ -.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} - SRCS+= pthread_md.c _umtx_op_err.S Modified: user/imp/tbemd/lib/libthr/arch/arm/Makefile.inc ============================================================================== --- user/imp/tbemd/lib/libthr/arch/arm/Makefile.inc Mon Sep 13 01:44:56 2010 (r212518) +++ user/imp/tbemd/lib/libthr/arch/arm/Makefile.inc Mon Sep 13 01:58:17 2010 (r212519) @@ -1,5 +1,3 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} - SRCS+= pthread_md.c Modified: user/imp/tbemd/lib/libthr/arch/i386/Makefile.inc ============================================================================== --- user/imp/tbemd/lib/libthr/arch/i386/Makefile.inc Mon Sep 13 01:44:56 2010 (r212518) +++ user/imp/tbemd/lib/libthr/arch/i386/Makefile.inc Mon Sep 13 01:58:17 2010 (r212519) @@ -1,5 +1,3 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} - SRCS+= pthread_md.c _umtx_op_err.S Modified: user/imp/tbemd/lib/libthr/arch/ia64/Makefile.inc ============================================================================== --- user/imp/tbemd/lib/libthr/arch/ia64/Makefile.inc Mon Sep 13 01:44:56 2010 (r212518) +++ user/imp/tbemd/lib/libthr/arch/ia64/Makefile.inc Mon Sep 13 01:58:17 2010 (r212519) @@ -1,5 +1,3 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} - SRCS+= _umtx_op_err.S pthread_md.c Modified: user/imp/tbemd/lib/libthr/arch/mips/Makefile.inc ============================================================================== --- user/imp/tbemd/lib/libthr/arch/mips/Makefile.inc Mon Sep 13 01:44:56 2010 (r212518) +++ user/imp/tbemd/lib/libthr/arch/mips/Makefile.inc Mon Sep 13 01:58:17 2010 (r212519) @@ -1,5 +1,3 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} - SRCS+= pthread_md.c Modified: user/imp/tbemd/lib/libthr/arch/powerpc/Makefile.inc ============================================================================== --- user/imp/tbemd/lib/libthr/arch/powerpc/Makefile.inc Mon Sep 13 01:44:56 2010 (r212518) +++ user/imp/tbemd/lib/libthr/arch/powerpc/Makefile.inc Mon Sep 13 01:58:17 2010 (r212519) @@ -1,5 +1,3 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} - SRCS+= pthread_md.c Modified: user/imp/tbemd/lib/libthr/arch/sparc64/Makefile.inc ============================================================================== --- user/imp/tbemd/lib/libthr/arch/sparc64/Makefile.inc Mon Sep 13 01:44:56 2010 (r212518) +++ user/imp/tbemd/lib/libthr/arch/sparc64/Makefile.inc Mon Sep 13 01:58:17 2010 (r212519) @@ -1,5 +1,3 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} - SRCS+= pthread_md.c Modified: user/imp/tbemd/lib/libthr/support/Makefile.inc ============================================================================== --- user/imp/tbemd/lib/libthr/support/Makefile.inc Mon Sep 13 01:44:56 2010 (r212518) +++ user/imp/tbemd/lib/libthr/support/Makefile.inc Mon Sep 13 01:58:17 2010 (r212519) @@ -1,9 +1,16 @@ # $FreeBSD$ .PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string -.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys +# libc must search machine_arch, then machine_cpuarch, but libthr has all its +# code implemented in machine_cpuarch. Cope. +.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/sys) +.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys +CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH} +.else +.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_CPUARCH} +.endif SYSCALLS= thr_new
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009130158.o8D1wHrP046364>