[src/trunk]: src/external/gpl3/gcc/dist/libmudflap Make declarations consiste...

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

details:   https://anonhg.NetBSD.org/src/rev/751d346a72e5
branches:  trunk
changeset: 778897:751d346a72e5
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Apr 19 15:52:39 2012 +0000

description:
Make declarations consistent, and change unsigned int to unsigned long so
that this works on LP64 machines. Why is the __mf_uintptr_t needed anyway?

diffstat:

 external/gpl3/gcc/dist/libmudflap/mf-runtime.c |  2 +-
 external/gpl3/gcc/dist/libmudflap/mf-runtime.h |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 0505cd971a6b -r 751d346a72e5 external/gpl3/gcc/dist/libmudflap/mf-runtime.c
--- a/external/gpl3/gcc/dist/libmudflap/mf-runtime.c    Thu Apr 19 15:36:06 2012 +0000
+++ b/external/gpl3/gcc/dist/libmudflap/mf-runtime.c    Thu Apr 19 15:52:39 2012 +0000
@@ -166,7 +166,7 @@
 #define LOOKUP_CACHE_SHIFT_DFL 2
 
 struct __mf_cache __mf_lookup_cache [LOOKUP_CACHE_SIZE_MAX];
-uintptr_t __mf_lc_mask = LOOKUP_CACHE_MASK_DFL;
+__mf_uintptr_t __mf_lc_mask = LOOKUP_CACHE_MASK_DFL;
 unsigned char __mf_lc_shift = LOOKUP_CACHE_SHIFT_DFL;
 #define LOOKUP_CACHE_SIZE (__mf_lc_mask + 1)
 
diff -r 0505cd971a6b -r 751d346a72e5 external/gpl3/gcc/dist/libmudflap/mf-runtime.h
--- a/external/gpl3/gcc/dist/libmudflap/mf-runtime.h    Thu Apr 19 15:36:06 2012 +0000
+++ b/external/gpl3/gcc/dist/libmudflap/mf-runtime.h    Thu Apr 19 15:52:39 2012 +0000
@@ -31,7 +31,7 @@
 #define MF_RUNTIME_H
 
 typedef void *__mf_ptr_t;
-typedef unsigned int __mf_uintptr_t __attribute__ ((__mode__ (__pointer__)));
+typedef unsigned long __mf_uintptr_t __attribute__ ((__mode__ (__pointer__)));
 typedef __SIZE_TYPE__ __mf_size_t;
 
 /* Global declarations used by instrumentation.  When _MUDFLAP is