diff options
| author | DJ Delorie <dj@redhat.com> | 2005-07-03 23:16:16 +0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2005-07-03 23:16:16 +0400 |
| commit | 1863470077b6a2b93e99534f595db92448d096cc (patch) | |
| tree | 5862808f56876f77e76d6f7616b3282e92bff0fe | |
| parent | aaa4ee1b899bc3252c12f2689c81a1360de4ca06 (diff) | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 7 | ||||
| -rw-r--r-- | include/ansidecl.h | 9 | ||||
| -rw-r--r-- | include/md5.h | 6 |
3 files changed, 21 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 22df3662d..ac58c8275 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,10 @@ +2005-07-03 Steve Ellcey <sje@cup.hp.com> + + PR other/13906 + * ansidecl.h (ATTRIBUTE_ALIGNED_ALIGNOF): New. + * md5.h (md5_uintptr): New. + (md5_ctx): Align buffer field. + 2005-06-30 Daniel Berlin <dberlin@dberlin.org> * hashtab.h (HTAB_DELETED_ENTRY): New macro. diff --git a/include/ansidecl.h b/include/ansidecl.h index 439431182..a1a765d63 100644 --- a/include/ansidecl.h +++ b/include/ansidecl.h @@ -352,6 +352,15 @@ So instead we use the macro below and test it against specific values. */ # endif /* GNUC >= 3.5 */ #endif /* ATTRIBUTE_SENTINEL */ + +#ifndef ATTRIBUTE_ALIGNED_ALIGNOF +# if (GCC_VERSION >= 3000) +# define ATTRIBUTE_ALIGNED_ALIGNOF(m) __attribute__ ((__aligned__ (__alignof__ (m)))) +# else +# define ATTRIBUTE_ALIGNED_ALIGNOF(m) +# endif /* GNUC >= 3.0 */ +#endif /* ATTRIBUTE_ALIGNED_ALIGNOF */ + /* We use __extension__ in some places to suppress -pedantic warnings about GCC extensions. This feature didn't work properly before gcc 2.8. */ diff --git a/include/md5.h b/include/md5.h index 655933f75..e35789346 100644 --- a/include/md5.h +++ b/include/md5.h @@ -37,6 +37,7 @@ #ifdef _LIBC # include <sys/types.h> typedef u_int32_t md5_uint32; +typedef uintptr_t md5_uintptr; #else # define INT_MAX_32_BITS 2147483647 @@ -64,6 +65,9 @@ typedef u_int32_t md5_uint32; # endif # endif # endif +/* We have to make a guess about the integer type equivalent in size + to pointers which should always be correct. */ +typedef unsigned long int md5_uintptr; #endif /* Structure to save state of computation between the single steps. */ @@ -76,7 +80,7 @@ struct md5_ctx md5_uint32 total[2]; md5_uint32 buflen; - char buffer[128]; + char buffer[128] ATTRIBUTE_ALIGNED_ALIGNOF(md5_uint32); }; /* |