From owner-svn-src-head@FreeBSD.ORG Sun Jun 13 01:27:30 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63C47106566B; Sun, 13 Jun 2010 01:27:30 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 517A78FC1A; Sun, 13 Jun 2010 01:27:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5D1RUnu070495; Sun, 13 Jun 2010 01:27:30 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5D1RUIp070486; Sun, 13 Jun 2010 01:27:30 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201006130127.o5D1RUIp070486@svn.freebsd.org> From: Warner Losh Date: Sun, 13 Jun 2010 01:27:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209118 - in head/lib/libkse: . arch/amd64 arch/arm arch/i386 arch/ia64 arch/powerpc arch/sparc64 support X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2010 01:27:30 -0000 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 \