Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys use gcc builtin for memset() on vax too.



details:   https://anonhg.NetBSD.org/src/rev/d10c3e900c48
branches:  trunk
changeset: 770037:d10c3e900c48
user:      chs <chs%NetBSD.org@localhost>
date:      Sat Oct 01 16:06:24 2011 +0000

description:
use gcc builtin for memset() on vax too.

diffstat:

 sys/arch/vax/include/macros.h |  4 ++--
 sys/lib/libkern/libkern.h     |  7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (49 lines):

diff -r 60b6adc8e3b8 -r d10c3e900c48 sys/arch/vax/include/macros.h
--- a/sys/arch/vax/include/macros.h     Sat Oct 01 16:02:21 2011 +0000
+++ b/sys/arch/vax/include/macros.h     Sat Oct 01 16:06:24 2011 +0000
@@ -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 @@
        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 @@
        return block;
 }
 #define memset vax_memset
+#endif
 
 #ifdef notdef 
 /* XXX - the return syntax of memcmp is wrong */
diff -r 60b6adc8e3b8 -r d10c3e900c48 sys/lib/libkern/libkern.h
--- a/sys/lib/libkern/libkern.h Sat Oct 01 16:02:21 2011 +0000
+++ b/sys/lib/libkern/libkern.h Sat Oct 01 16:06:24 2011 +0000
@@ -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 @@
 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
 



Home | Main Index | Thread Index | Old Index