diff options
author | imp <imp@FreeBSD.org> | 2010-09-13 06:35:35 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2010-09-13 06:35:35 +0000 |
commit | e71de0e512cb886d5290ed9b12ba52bdfde06200 (patch) | |
tree | 67685c6e3d57108be209362fa54122593a7ca933 /usr.bin/xlint | |
parent | 1b35612118ef4e6ca7fc7d5bedb931152eb66eff (diff) | |
download | FreeBSD-src-e71de0e512cb886d5290ed9b12ba52bdfde06200.zip FreeBSD-src-e71de0e512cb886d5290ed9b12ba52bdfde06200.tar.gz |
Revert r212513 and reimplement the search order to be ARCH, CPUARCH
Diffstat (limited to 'usr.bin/xlint')
-rw-r--r-- | usr.bin/xlint/Makefile.inc | 11 | ||||
-rw-r--r-- | usr.bin/xlint/arch/powerpc/targparam.h | 9 | ||||
-rw-r--r-- | usr.bin/xlint/arch/powerpc64/targparam.h | 55 |
3 files changed, 62 insertions, 13 deletions
diff --git a/usr.bin/xlint/Makefile.inc b/usr.bin/xlint/Makefile.inc index f4956ab..ebdcbe3 100644 --- a/usr.bin/xlint/Makefile.inc +++ b/usr.bin/xlint/Makefile.inc @@ -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 diff --git a/usr.bin/xlint/arch/powerpc/targparam.h b/usr.bin/xlint/arch/powerpc/targparam.h index 2316f30..554f9b3 100644 --- a/usr.bin/xlint/arch/powerpc/targparam.h +++ b/usr.bin/xlint/arch/powerpc/targparam.h @@ -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) diff --git a/usr.bin/xlint/arch/powerpc64/targparam.h b/usr.bin/xlint/arch/powerpc64/targparam.h new file mode 100644 index 0000000..09bfd3e --- /dev/null +++ b/usr.bin/xlint/arch/powerpc64/targparam.h @@ -0,0 +1,55 @@ +/* $NetBSD: targparam.h,v 1.1 2002/01/18 20:39:20 thorpej Exp $ */ + +/* + * Copyright (c) 1994, 1995 Jochen Pohl + * All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Jochen Pohl for + * The NetBSD Project. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* + * Machine-dependent target parameters for lint1. + */ + +#include "lp64.h" + +/* + * Should be set to 1 if the difference of two pointers is of type long + * or the value of sizeof is of type unsigned long. Note this MUST be + * kept in sync with the compiler! + */ + +#define PTRDIFF_IS_LONG 1 +#define SIZEOF_IS_ULONG 1 + +#define FLOAT_SIZE (4 * CHAR_BIT) +#define DOUBLE_SIZE (8 * CHAR_BIT) +#define LDOUBLE_SIZE (8 * CHAR_BIT) + +#define ENUM_SIZE (4 * CHAR_BIT) |