diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2013-01-18 12:34:11 -0800 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2013-01-18 12:34:11 -0800 |
commit | 43269d882367dc4f0e4c2651d6625e1b7de78764 (patch) | |
tree | 6aaf525a6fb8a4fb63a71c9ca56be58bc1d6655b /gcc/pointer-set.c | |
parent | ce97ec0e268b7b50b9f801dd12ffc67042c47193 (diff) | |
parent | 48dc1117de124a2265129a36bfbbc211522c2c02 (diff) | |
download | gcc-hjl/tsx/gcc-4_7-branch.tar.gz |
Merge remote-tracking branch 'origin/gcc-4_7-branch' into hjl/tsx/gcc-4_7-branchhjl/tsx/gcc-4_7-branch
Conflicts:
gcc/config/i386/driver-i386.c
gcc/config/i386/i386.c
gcc/config/i386/sync.md
Diffstat (limited to 'gcc/pointer-set.c')
-rw-r--r-- | gcc/pointer-set.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/pointer-set.c b/gcc/pointer-set.c index b57c404f6a1..ebad5dbf5b3 100644 --- a/gcc/pointer-set.c +++ b/gcc/pointer-set.c @@ -64,7 +64,7 @@ hash1 (const void *p, unsigned long max, unsigned long logmax) #endif const unsigned long shift = HOST_BITS_PER_LONG - logmax; - return ((A * (unsigned long) p) >> shift) & (max - 1); + return ((A * (uintptr_t) p) >> shift) & (max - 1); } /* Allocate an empty pointer set. */ |