From 9cbda5febfa066ff1d9ce80b1ba78f1fcb5bce32 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 13 Sep 2010 01:20:53 +0000 Subject: [PATCH] merge powerpc and powerpc64 now that we use TARGET_CPUARCH --- usr.bin/xlint/arch/powerpc/targparam.h | 11 +++++ usr.bin/xlint/arch/powerpc64/targparam.h | 55 ------------------------ 2 files changed, 11 insertions(+), 55 deletions(-) delete mode 100644 usr.bin/xlint/arch/powerpc64/targparam.h diff --git a/usr.bin/xlint/arch/powerpc/targparam.h b/usr.bin/xlint/arch/powerpc/targparam.h index d49eb7643888..2316f30983bb 100644 --- a/usr.bin/xlint/arch/powerpc/targparam.h +++ b/usr.bin/xlint/arch/powerpc/targparam.h @@ -29,13 +29,19 @@ * 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. */ +#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 @@ -43,8 +49,13 @@ * 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 deleted file mode 100644 index 09bfd3e2b3ca..000000000000 --- a/usr.bin/xlint/arch/powerpc64/targparam.h +++ /dev/null @@ -1,55 +0,0 @@ -/* $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)