From: Bruno Haible <bruno@clisp.org>
Date: Sun, 13 Apr 2008 17:25:13 +0000 (+0200)
Subject: Work around a HP cc compiler bug.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8965b7823ae5167a60fa39ad91b9fdc26280513;p=pspp

Work around a HP cc compiler bug.
---

diff --git a/ChangeLog b/ChangeLog
index 3ac00fa19d..1b57b0f76b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-13  Bruno Haible  <bruno@clisp.org>
+
+	* lib/count-one-bits.h (COUNT_ONE_BITS): Rewrite verification
+	expression, so as to avoid HP-UX 11 cc compiler bug.
+
 2008-04-13  Bruno Haible  <bruno@clisp.org>
 
 	* m4/regex.m4 (gl_PREREQ_REGEX): Also check for <libintl.h>.
diff --git a/lib/count-one-bits.h b/lib/count-one-bits.h
index b1087c3ea2..ae8a5a89bf 100644
--- a/lib/count-one-bits.h
+++ b/lib/count-one-bits.h
@@ -1,5 +1,5 @@
 /* count-one-bits.h -- counts the number of 1-bits in a word.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
         return BUILTIN (x);
 #else
 #define COUNT_ONE_BITS(BUILTIN, TYPE)                                       \
-        verify ((TYPE) -1 >> 31 >> 31 <= 3); /* TYPE has at most 64 bits */ \
+        verify (((TYPE) -1 >> 31 >> 31 >> 2) == 0); /* TYPE has at most 64 bits */ \
         int count = count_one_bits_32 (x);                                  \
         if (1 < (TYPE) -1 >> 31) /* TYPE has more than 32 bits? */          \
           count += count_one_bits_32 (x >> 31 >> 1);                        \