aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Tietz <ktietz@redhat.com>2013-01-30 17:50:49 +0100
committerKai Tietz <ktietz@gcc.gnu.org>2013-01-30 17:50:49 +0100
commit162b4e41267d991038ff159a28a78388608a99ff (patch)
treeb0a26ff13749e4d1b9ee1a392b13fe8e29e67608
parent44136976f9a52137fdd2f3f1504f057971c723a6 (diff)
downloadgcc-162b4e41267d991038ff159a28a78388608a99ff.zip
gcc-162b4e41267d991038ff159a28a78388608a99ff.tar.gz
gcc-162b4e41267d991038ff159a28a78388608a99ff.tar.bz2
re PR other/54620 (sha1.c has incorrect math if sizeof(size_t) is 8)
PR other/54620 PR target/39064 * md5.h (md5_uintptr, md5_uint32): Define as uintptr_t/uint32_t if stdint.h and sys/types.h headers are present. * sha1.h (sha1_uintptr, sha1_uint32): Likewise. From-SVN: r195579
-rw-r--r--include/ChangeLog8
-rw-r--r--include/md5.h5
-rw-r--r--include/sha1.h5
3 files changed, 18 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index f3acbfc..e57a42a 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-30 Kai Tietz <ktietz@redhat.com>
+
+ PR other/54620
+ PR target/39064
+ * md5.h (md5_uintptr, md5_uint32): Define as uintptr_t/uint32_t if
+ stdint.h and sys/types.h headers are present.
+ * sha1.h (sha1_uintptr, sha1_uint32): Likewise.
+
2012-12-18 Aldy Hernandez <aldyh@redhat.com>
PR other/54324
diff --git a/include/md5.h b/include/md5.h
index b3ff4e1..6da2fef 100644
--- a/include/md5.h
+++ b/include/md5.h
@@ -40,6 +40,11 @@
# include <sys/types.h>
typedef u_int32_t md5_uint32;
typedef uintptr_t md5_uintptr;
+#elif defined (HAVE_SYS_TYPES_H) && defined (HAVE_STDINT_H)
+#include <stdint.h>
+#include <sys/types.h>
+typedef uint32_t md5_uint32;
+typedef uintptr_t md5_uintptr;
#else
# define INT_MAX_32_BITS 2147483647
diff --git a/include/sha1.h b/include/sha1.h
index 5473f91..4da5c37 100644
--- a/include/sha1.h
+++ b/include/sha1.h
@@ -39,6 +39,11 @@
# include <sys/types.h>
typedef u_int32_t sha1_uint32;
typedef uintptr_t sha1_uintptr;
+#elif defined (HAVE_SYS_TYPES_H) && defined (HAVE_STDINT_H)
+#include <stdint.h>
+#include <sys/types.h>
+typedef uint32_t sha1_uint32;
+typedef uintptr_t sha1_uintptr;
#else
# define INT_MAX_32_BITS 2147483647