From owner-svn-src-all@FreeBSD.ORG Sat Aug 28 15:03:11 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5E3810656AB; Sat, 28 Aug 2010 15:03:11 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C33478FC08; Sat, 28 Aug 2010 15:03:11 +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 o7SF3BEn034635; Sat, 28 Aug 2010 15:03:11 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7SF3B2j034626; Sat, 28 Aug 2010 15:03:11 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201008281503.o7SF3B2j034626@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 28 Aug 2010 15:03:11 +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: r211934 - in head: . gnu/lib/libgomp lib lib/libkvm lib/libthread_db/arch/powerpc64 lib/msun secure/lib/libcrypto usr.sbin/kldxref X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Aug 2010 15:03:11 -0000 Author: nwhitehorn Date: Sat Aug 28 15:03:11 2010 New Revision: 211934 URL: http://svn.freebsd.org/changeset/base/211934 Log: Repair some build breakage introduced in r211725 and garbage collect some code made obsolete in the same commit. Deleted: head/lib/libthread_db/arch/powerpc64/ head/secure/lib/libcrypto/opensslconf-powerpc64.h Modified: head/Makefile.inc1 head/gnu/lib/libgomp/Makefile head/lib/Makefile head/lib/libkvm/Makefile head/lib/msun/Makefile head/secure/lib/libcrypto/Makefile head/secure/lib/libcrypto/opensslconf-powerpc.h head/usr.sbin/kldxref/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Aug 28 14:15:18 2010 (r211933) +++ head/Makefile.inc1 Sat Aug 28 15:03:11 2010 (r211934) @@ -1133,8 +1133,8 @@ _prereq_libs= gnu/lib/libssp/libssp_nons _startup_libs= gnu/lib/csu .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) _startup_libs+= lib/csu/${MACHINE_ARCH}-elf -.elif exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf) -_startup_libs+= lib/csu/${MACHINE_CPUARCH}-elf +.elif exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}) +_startup_libs+= lib/csu/${MACHINE_ARCH} .else _startup_libs+= lib/csu/${MACHINE_CPUARCH} .endif Modified: head/gnu/lib/libgomp/Makefile ============================================================================== --- head/gnu/lib/libgomp/Makefile Sat Aug 28 14:15:18 2010 (r211933) +++ head/gnu/lib/libgomp/Makefile Sat Aug 28 15:03:11 2010 (r211934) @@ -24,7 +24,7 @@ VERSION_MAP= ${SRCDIR}/libgomp.map # Target-specific OpenMP configuration .if ${MACHINE_CPUARCH} == arm || ${MACHINE_CPUARCH} == i386 || \ - ${MACHINE_CPUARCH} == powerpc || \ + ${MACHINE_ARCH} == powerpc || \ (${MACHINE_CPUARCH} == mips && \ (!defined(TARGET_ABI) || ${TARGET_ABI} != "n64")) OMP_LOCK_ALIGN = 4 Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Sat Aug 28 14:15:18 2010 (r211933) +++ head/lib/Makefile Sat Aug 28 15:03:11 2010 (r211934) @@ -114,8 +114,8 @@ SUBDIR= ${SUBDIR_ORDERED} \ .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf -.elif exists(${.CURDIR}/csu/${MACHINE_CPUARCH}-elf) -_csu=csu/${MACHINE_CPUARCH}-elf +.elif exists(${.CURDIR}/csu/${MACHINE_ARCH}) +_csu=csu/${MACHINE_ARCH} .elif exists(${.CURDIR}/csu/${MACHINE_CPUARCH}/Makefile) _csu=csu/${MACHINE_CPUARCH} .else Modified: head/lib/libkvm/Makefile ============================================================================== --- head/lib/libkvm/Makefile Sat Aug 28 14:15:18 2010 (r211933) +++ head/lib/libkvm/Makefile Sat Aug 28 15:03:11 2010 (r211934) @@ -9,13 +9,19 @@ CFLAGS+=-DLIBC_SCCS -I${.CURDIR} CFLAGS+=-DSUN4V .endif +.if exists(${.CURDIR}/kvm_${MACHINE_ARCH}.c) +KVM_ARCH=${MACHINE_ARCH} +.else +KVM_ARCH=${MACHINE_CPUARCH} +.endif + WARNS?= 0 -SRCS= kvm.c kvm_${MACHINE_CPUARCH}.c kvm_cptime.c kvm_file.c kvm_getloadavg.c \ +SRCS= kvm.c kvm_${KVM_ARCH}.c kvm_cptime.c kvm_file.c kvm_getloadavg.c \ kvm_getswapinfo.c kvm_pcpu.c kvm_proc.c kvm_vnet.c .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ ${MACHINE_CPUARCH} == "arm" -SRCS+= kvm_minidump_${MACHINE_CPUARCH}.c +SRCS+= kvm_minidump_${KVM_ARCH}.c .endif INCS= kvm.h Modified: head/lib/msun/Makefile ============================================================================== --- head/lib/msun/Makefile Sat Aug 28 14:15:18 2010 (r211933) +++ head/lib/msun/Makefile Sat Aug 28 15:03:11 2010 (r211934) @@ -75,8 +75,13 @@ COMMON_SRCS= b_exp.c b_log.c b_tgamma.c # Location of fpmath.h and _fpmath.h LIBCDIR= ${.CURDIR}/../libc +.if exists(${LIBCDIR}/${MACHINE_ARCH}) +LIBC_ARCH=${MACHINE_ARCH} +.else +LIBC_ARCH=${MACHINE_CPUARCH} +.endif CFLAGS+= -I${.CURDIR}/src -I${LIBCDIR}/include \ - -I${LIBCDIR}/${MACHINE_CPUARCH} + -I${LIBCDIR}/${LIBC_ARCH} SYM_MAPS+= ${.CURDIR}/Symbol.map VERSION_DEF= ${LIBCDIR}/Versions.def Modified: head/secure/lib/libcrypto/Makefile ============================================================================== --- head/secure/lib/libcrypto/Makefile Sat Aug 28 14:15:18 2010 (r211933) +++ head/secure/lib/libcrypto/Makefile Sat Aug 28 15:03:11 2010 (r211934) @@ -351,7 +351,7 @@ buildinf.h: ${.CURDIR}/Makefile ( echo "#ifndef MK1MF_BUILD"; \ echo " /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \ echo " #define CFLAGS \"$(CC)\""; \ - echo " #define PLATFORM \"FreeBSD-${MACHINE_CPUARCH}\""; \ + echo " #define PLATFORM \"FreeBSD-${MACHINE_ARCH}\""; \ echo "#endif" ) > ${.TARGET} opensslconf.h: opensslconf-${MACHINE_CPUARCH}.h Modified: head/secure/lib/libcrypto/opensslconf-powerpc.h ============================================================================== --- head/secure/lib/libcrypto/opensslconf-powerpc.h Sat Aug 28 14:15:18 2010 (r211933) +++ head/secure/lib/libcrypto/opensslconf-powerpc.h Sat Aug 28 15:03:11 2010 (r211934) @@ -110,13 +110,17 @@ /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #ifndef DES_LONG -#define DES_LONG unsigned long +#define DES_LONG unsigned int #endif #endif #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) #define CONFIG_HEADER_BN_H +#ifdef __powerpc64__ +#undef BN_LLONG +#else #define BN_LLONG +#endif /* Should we define BN_DIV2W here? */ @@ -124,9 +128,14 @@ /* The prime number generation stuff may not work when * EIGHT_BIT but I don't care since I've only used this mode * for debuging the bignum libraries */ +#ifdef __powerpc64__ +#define SIXTY_FOUR_BIT_LONG +#undef THIRTY_TWO_BIT +#else #undef SIXTY_FOUR_BIT_LONG -#undef SIXTY_FOUR_BIT #define THIRTY_TWO_BIT +#endif +#undef SIXTY_FOUR_BIT #undef SIXTEEN_BIT #undef EIGHT_BIT #endif Modified: head/usr.sbin/kldxref/Makefile ============================================================================== --- head/usr.sbin/kldxref/Makefile Sat Aug 28 14:15:18 2010 (r211933) +++ head/usr.sbin/kldxref/Makefile Sat Aug 28 15:03:11 2010 (r211934) @@ -7,7 +7,7 @@ SRCS= kldxref.c ef.c ef_obj.c WARNS?= 2 CFLAGS+=-fno-strict-aliasing -.if exists(ef_${MACHINE_CPUARCH}.c) +.if exists(ef_${MACHINE_CPUARCH}.c) && ${MACHINE_ARCH} != "powerpc64" SRCS+= ef_${MACHINE_CPUARCH}.c .else SRCS+= ef_nop.c