Module Name: src
Committed By: chs
Date: Sat Oct 1 16:06:25 UTC 2011
Modified Files:
src/sys/arch/vax/include: macros.h
src/sys/lib/libkern: libkern.h
Log Message:
use gcc builtin for memset() on vax too.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/vax/include/macros.h
cvs rdiff -u -r1.102 -r1.103 src/sys/lib/libkern/libkern.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/include/macros.h
diff -u src/sys/arch/vax/include/macros.h:1.44 src/sys/arch/vax/include/macros.h:1.45
--- src/sys/arch/vax/include/macros.h:1.44 Thu Nov 22 23:02:05 2007
+++ src/sys/arch/vax/include/macros.h Sat Oct 1 16:06:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: macros.h,v 1.44 2007/11/22 23:02:05 plunky Exp $ */
+/* $NetBSD: macros.h,v 1.45 2011/10/01 16:06:24 chs Exp $ */
/*
* Copyright (c) 1994, 1998, 2000 Ludd, University of Lule}, Sweden.
@@ -106,7 +106,6 @@ vax_memmove(void *to, const void *from,
return to;
}
#define memmove vax_memmove
-#endif
static __inline void *__attribute__((__unused__))
vax_memset(void *block, int c, size_t len)
@@ -122,6 +121,7 @@ vax_memset(void *block, int c, size_t le
return block;
}
#define memset vax_memset
+#endif
#ifdef notdef
/* XXX - the return syntax of memcmp is wrong */
Index: src/sys/lib/libkern/libkern.h
diff -u src/sys/lib/libkern/libkern.h:1.102 src/sys/lib/libkern/libkern.h:1.103
--- src/sys/lib/libkern/libkern.h:1.102 Thu Sep 29 20:50:09 2011
+++ src/sys/lib/libkern/libkern.h Sat Oct 1 16:06:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: libkern.h,v 1.102 2011/09/29 20:50:09 christos Exp $ */
+/* $NetBSD: libkern.h,v 1.103 2011/10/01 16:06:24 chs Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -257,12 +257,11 @@ struct mtprng_state {
void *memcpy(void *, const void *, size_t);
int memcmp(const void *, const void *, size_t);
void *memset(void *, int, size_t);
-#if __GNUC_PREREQ__(2, 95) && (__GNUC_PREREQ__(4, 0) || !defined(__vax__)) && \
- !defined(_STANDALONE)
+#if __GNUC_PREREQ__(2, 95) && !defined(_STANDALONE)
#define memcpy(d, s, l) __builtin_memcpy(d, s, l)
#define memcmp(a, b, l) __builtin_memcmp(a, b, l)
#endif
-#if __GNUC_PREREQ__(2, 95) && !defined(__vax__) && !defined(_STANDALONE)
+#if __GNUC_PREREQ__(2, 95) && !defined(_STANDALONE)
#define memset(d, v, l) __builtin_memset(d, v, l)
#endif
