From: Kai Tietz <ktietz@redhat.com>
Date: Wed, 30 Jan 2013 16:58:10 +0000 (+0100)
Subject: re PR other/54620 (sha1.c has incorrect math if sizeof(size_t) is 8)
X-Git-Tag: releases/gcc-4.6.4~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d98540bbcb7ccf4c40c6df0ce1cef2c5fbb37ade;p=thirdparty%2Fgcc.git

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: r195581
---

diff --git a/include/ChangeLog b/include/ChangeLog
index 3c1d408c13e4..27841522631c 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,13 @@
+2013-01-30  Kai Tietz  <ktietz@redhat.com>
+
+	Merged from trunk.
+
+	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-03-01  Release Manager
 
 	* GCC 4.6.3 released.
diff --git a/include/md5.h b/include/md5.h
index b3ff4e14538d..6da2fefe1611 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 5473f91f412b..4da5c37f3867 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