Date: Mon, 13 Sep 2010 06:35:35 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r212534 - in head/usr.bin/xlint: . arch/powerpc arch/powerpc64 Message-ID: <201009130635.o8D6ZZIl069203@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Sep 13 06:35:35 2010 New Revision: 212534 URL: http://svn.freebsd.org/changeset/base/212534 Log: Revert r212513 and reimplement the search order to be ARCH, CPUARCH Added: head/usr.bin/xlint/arch/powerpc64/ - copied from r212512, head/usr.bin/xlint/arch/powerpc64/ Modified: head/usr.bin/xlint/Makefile.inc head/usr.bin/xlint/arch/powerpc/targparam.h Modified: head/usr.bin/xlint/Makefile.inc ============================================================================== --- head/usr.bin/xlint/Makefile.inc Mon Sep 13 06:32:56 2010 (r212533) +++ head/usr.bin/xlint/Makefile.inc Mon Sep 13 06:35:35 2010 (r212534) @@ -7,14 +7,17 @@ WARNS?= 0 # These assignments duplicate much of the functionality of # MACHINE_CPUARCH, but there's no easy way to export make functions... - .if defined(TARGET_ARCH) -TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/} +TARGET_CPUARCH= ${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/} .else -TARGET_CPUARCH=${MACHINE_CPUARCH} +TARGET_CPUARCH= ${MACHINE_CPUARCH} +TARGET_ARCH= ${MACHINE_ARCH} .endif -TARGET_ARCH?= ${MACHINE_ARCH} +.if exists(${.CURDIR}/../arch/${TARGET_ARCH} +CFLAGS+= -I${.CURDIR}/../arch/${TARGET_ARCH} +.else CFLAGS+= -I${.CURDIR}/../arch/${TARGET_CPUARCH} +.enidf CFLAGS+= -I${.CURDIR}/../common OBJECT_FMT= ELF Modified: head/usr.bin/xlint/arch/powerpc/targparam.h ============================================================================== --- head/usr.bin/xlint/arch/powerpc/targparam.h Mon Sep 13 06:32:56 2010 (r212533) +++ head/usr.bin/xlint/arch/powerpc/targparam.h Mon Sep 13 06:35:35 2010 (r212534) @@ -37,11 +37,7 @@ * Machine-dependent target parameters for lint1. */ -#ifdef __powerpc64__ -#include "lp64.h" -#else #include "ilp32.h" -#endif /* * Should be set to 1 if the difference of two pointers is of type long @@ -49,13 +45,8 @@ * kept in sync with the compiler! */ -#ifdef __powerpc64__ -#define PTRDIFF_IS_LONG 1 -#define SIZEOF_IS_ULONG 1 -#else #define PTRDIFF_IS_LONG 0 #define SIZEOF_IS_ULONG 0 -#endif #define FLOAT_SIZE (4 * CHAR_BIT) #define DOUBLE_SIZE (8 * CHAR_BIT)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009130635.o8D6ZZIl069203>