[src/netbsd-1-6]: src/sys/lib/libkern Pull up revisions 1.42-1.43 (requested ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/03fb52766e53
branches:  netbsd-1-6
changeset: 529643:03fb52766e53
user:      he <he%NetBSD.org@localhost>
date:      Tue Dec 03 22:11:07 2002 +0000

description:
Pull up revisions 1.42-1.43 (requested by thorpej in ticket #1024):
  Don't use __builtin_ffs() on vax, ffs is an instruction
  there already.  Also, always provide an ffs() prototype.
Should fix build problem on vax.

diffstat:

 sys/lib/libkern/libkern.h |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r 0dc31fd9ad54 -r 03fb52766e53 sys/lib/libkern/libkern.h
--- a/sys/lib/libkern/libkern.h Sun Dec 01 22:51:40 2002 +0000
+++ b/sys/lib/libkern/libkern.h Tue Dec 03 22:11:07 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: libkern.h,v 1.39.10.1 2002/11/21 18:05:15 he Exp $     */
+/*     $NetBSD: libkern.h,v 1.39.10.2 2002/12/03 22:11:07 he Exp $     */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -286,8 +286,11 @@
 char   *strchr __P((const char *, int));
 char   *strrchr __P((const char *, int));
 
+/*
+ * ffs is an instruction on vax.
+ */
 int     ffs __P((int));
-#if __GNUC_PREREQ__(2, 95)
+#if __GNUC_PREREQ__(2, 95) && !defined(__vax__)
 #define        ffs(x)                  __builtin_ffs(x)
 #endif