Module Name: src
Committed By: christos
Date: Thu Apr 19 15:52:39 UTC 2012
Modified Files:
src/external/gpl3/gcc/dist/libmudflap: mf-runtime.c mf-runtime.h
Log Message:
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?
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/libmudflap/mf-runtime.c \
src/external/gpl3/gcc/dist/libmudflap/mf-runtime.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libmudflap/mf-runtime.c
diff -u src/external/gpl3/gcc/dist/libmudflap/mf-runtime.c:1.2 src/external/gpl3/gcc/dist/libmudflap/mf-runtime.c:1.3
--- src/external/gpl3/gcc/dist/libmudflap/mf-runtime.c:1.2 Tue Apr 17 22:55:05 2012
+++ src/external/gpl3/gcc/dist/libmudflap/mf-runtime.c Thu Apr 19 11:52:39 2012
@@ -166,7 +166,7 @@ begin_recursion_protect1 (const char *pf
#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)
Index: src/external/gpl3/gcc/dist/libmudflap/mf-runtime.h
diff -u src/external/gpl3/gcc/dist/libmudflap/mf-runtime.h:1.2 src/external/gpl3/gcc/dist/libmudflap/mf-runtime.h:1.3
--- src/external/gpl3/gcc/dist/libmudflap/mf-runtime.h:1.2 Tue Apr 17 22:55:05 2012
+++ src/external/gpl3/gcc/dist/libmudflap/mf-runtime.h Thu Apr 19 11:52:39 2012
@@ -31,7 +31,7 @@ see the files COPYING3 and COPYING.RUNTI
#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
