diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-06 21:47:08 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-06 21:47:33 -0700 |
| commit | 9d56a21e6a696ad19ac65c4b405aeca44785884a (patch) | |
| tree | a1528f0268913de8da6d212d66721063c79b0caf /lib | |
| parent | 4d748735d5c49f73e1d49123f7188c9a2fd7d252 (diff) | |
| download | emacs-9d56a21e6a696ad19ac65c4b405aeca44785884a.tar.gz | |
Merge from gnulib
* lib/stddef.in.h: Update from gnulib, incorporating:
2015-04-02 stddef: port to pre-C11 GCC on x86
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stddef.in.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/lib/stddef.in.h b/lib/stddef.in.h index 44db24173c4..698307bc955 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -83,12 +83,23 @@ /* Some platforms lack max_align_t. */ #if !@HAVE_MAX_ALIGN_T@ +/* On the x86, the maximum storage alignment of double, long, etc. is 4, + but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8, + and the C11 standard allows this. Work around this problem by + using __alignof__ (which returns 8 for double) rather than _Alignof + (which returns 4), and align each union member accordingly. */ +# ifdef __GNUC__ +# define _GL_STDDEF_ALIGNAS(type) \ + __attribute__ ((__aligned__ (__alignof__ (type)))) +# else +# define _GL_STDDEF_ALIGNAS(type) /* */ +# endif typedef union { - char *__p; - double __d; - long double __ld; - long int __i; + char *__p _GL_STDDEF_ALIGNAS (char *); + double __d _GL_STDDEF_ALIGNAS (double); + long double __ld _GL_STDDEF_ALIGNAS (long double); + long int __i _GL_STDDEF_ALIGNAS (long int); } max_align_t; #endif |