Module Name:    src
Committed By:   mrg
Date:           Sun Jul 11 12:07:32 UTC 2010

Modified Files:
        src/usr.bin/xlint/arch/arm: targparam.h
        src/usr.bin/xlint/arch/vax: targparam.h
        src/usr.bin/xlint/lint1: Makefile

Log Message:
remove the remaining non-ELF code.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/xlint/arch/arm/targparam.h
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/xlint/arch/vax/targparam.h
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/xlint/lint1/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/xlint/arch/arm/targparam.h
diff -u src/usr.bin/xlint/arch/arm/targparam.h:1.3 src/usr.bin/xlint/arch/arm/targparam.h:1.4
--- src/usr.bin/xlint/arch/arm/targparam.h:1.3	Thu May 29 18:12:13 2003
+++ src/usr.bin/xlint/arch/arm/targparam.h	Sun Jul 11 12:07:31 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: targparam.h,v 1.3 2003/05/29 18:12:13 christos Exp $	*/
+/*	$NetBSD: targparam.h,v 1.4 2010/07/11 12:07:31 mrg Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -43,23 +43,13 @@
  * kept in sync with the compiler!
  */     
 
-#if defined(TARGET_OBJFMT_ELF)
 #define	PTRDIFF_IS_LONG		1
 #define	SIZEOF_IS_ULONG		1
 #define	INTPTR_IS_LONG		1
-#else
-#define	PTRDIFF_IS_LONG		0
-#define	SIZEOF_IS_ULONG		0
-#define	INTPTR_IS_LONG		0
-#endif
 
 #define	FLOAT_SIZE		(4 * CHAR_BIT)
 #define	DOUBLE_SIZE		(8 * CHAR_BIT)
 #define	LDOUBLE_SIZE		(8 * CHAR_BIT)
 
-#if defined(TARGET_OBJFMT_ELF)
 /* XXX ARM ELF ABI says packed enums -- variable size! */
 #define	ENUM_SIZE		(4 * CHAR_BIT)
-#else
-#define	ENUM_SIZE		(4 * CHAR_BIT)
-#endif

Index: src/usr.bin/xlint/arch/vax/targparam.h
diff -u src/usr.bin/xlint/arch/vax/targparam.h:1.4 src/usr.bin/xlint/arch/vax/targparam.h:1.5
--- src/usr.bin/xlint/arch/vax/targparam.h:1.4	Fri Oct 20 12:51:12 2006
+++ src/usr.bin/xlint/arch/vax/targparam.h	Sun Jul 11 12:07:31 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: targparam.h,v 1.4 2006/10/20 12:51:12 he Exp $	*/
+/*	$NetBSD: targparam.h,v 1.5 2010/07/11 12:07:31 mrg Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -42,15 +42,9 @@
  * or the value of sizeof is of type unsigned long.  Note this MUST be
  * kept in sync with the compiler!
  */     
-#ifdef __ELF__
 #define	PTRDIFF_IS_LONG		1
 #define	SIZEOF_IS_ULONG		1
 #define	INTPTR_IS_LONG		1
-#else
-#define	PTRDIFF_IS_LONG		0
-#define	SIZEOF_IS_ULONG		0
-#define	INTPTR_IS_LONG		0
-#endif
 
 #define	FLOAT_SIZE		(4 * CHAR_BIT)
 #define	DOUBLE_SIZE		(8 * CHAR_BIT)

Index: src/usr.bin/xlint/lint1/Makefile
diff -u src/usr.bin/xlint/lint1/Makefile:1.44 src/usr.bin/xlint/lint1/Makefile:1.45
--- src/usr.bin/xlint/lint1/Makefile:1.44	Tue Jul  6 06:00:03 2010
+++ src/usr.bin/xlint/lint1/Makefile	Sun Jul 11 12:07:32 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.44 2010/07/06 06:00:03 mrg Exp $
+#	$NetBSD: Makefile,v 1.45 2010/07/11 12:07:32 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -12,8 +12,6 @@
 
 CPPFLAGS+=	-I${.CURDIR} -I. -DPASS=\"${PROG}.h\"
 
-CPPFLAGS+=	-DTARGET_OBJFMT_ELF
-
 LINTFLAGS=	-aehpz
 BINDIR=		/usr/libexec
 

Reply via email to