summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2012-10-29 10:17:52 +0000
committerAlan Modra <amodra@gmail.com>2012-10-29 10:17:52 +0000
commit0c5daaa929ca977e105c2c530e0d62b462125bf8 (patch)
treece94805ee0b27252104ccde572035fcedab20471
parentce23608fa264db7678dcd80feddcf3bcb2b82a5e (diff)
* sb.c (sb_check): Use __builtin_clzll when size_t is not the
same size as long.
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/sb.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index deefdd6629..81759bdfda 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
2012-10-29 Alan Modra <amodra@gmail.com>
+ * sb.c (sb_check): Use __builtin_clzll when size_t is not the
+ same size as long.
+
+2012-10-29 Alan Modra <amodra@gmail.com>
+
* config/tc-ppc.c (ppc_znop): Remove unused vars.
2012-10-26 Alan Modra <amodra@gmail.com>
diff --git a/gas/sb.c b/gas/sb.c
index f68402fc47..f21f46e9d2 100644
--- a/gas/sb.c
+++ b/gas/sb.c
@@ -137,7 +137,10 @@ sb_check (sb *ptr, size_t len)
if ((ssize_t) want < 0)
as_fatal ("string buffer overflow");
#if GCC_VERSION >= 3004
- max = (size_t) 1 << (CHAR_BIT * sizeof (want) - __builtin_clzl (want));
+ max = (size_t) 1 << (CHAR_BIT * sizeof (want)
+ - (sizeof (want) <= sizeof (long)
+ ? __builtin_clzl ((long) want)
+ : __builtin_clzll ((long long) want)));
#else
max = 128;
while (want > max)