diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-28 16:05:32 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-28 16:05:32 -0700 |
| commit | e32a579975bc219bc24d403deeb1fa89187fc51e (patch) | |
| tree | 957a729b7f4eb64980359a57828f02d29e6758e7 /msdos | |
| parent | 01bd1b0df605d644ae31e8f1f81d926a5d8c7099 (diff) | |
| download | emacs-e32a579975bc219bc24d403deeb1fa89187fc51e.tar.gz | |
Use Gnulib stdalign and environ modules (Bug#9772, Bug#9960).
* .bzrignore: Add lib/stdalign.h.
* config.bat: Do not set NO_DECL_ALIGN; no longer needed.
Copy lib/stdalign.in.h to lib/stdalign.in-h as needed.
* configure.ac (HAVE_ATTRIBUTE_ALIGNED): Remove the code that
fiddles with this, as gnulib now does this for us.
* admin/merge-gnulib: Add environ, stdalign.
* m4/environ.m4: New file, from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/stdalign.in.h, m4/stdalign.m4: New files, from gnulib.
* sed2v2.inp (HAVE_ATTRIBUTE_ALIGNED): Remove edit.
* sedlibmk.inp (STDALIGN_H, @GL_GENERATE_STDALIGN_H_TRUE@)
(GL_GENERATE_STDALIGN_H_FALSE): New edits.
* nt/config.nt (HAVE_ATTRIBUTE_ALIGNED): Remove.
* src/alloc.c (XMALLOC_BASE_ALIGNMENT, GC_POINTER_ALIGNMENT, pure_alloc):
Simplify by using alignof.
(pure_alloc) [! USE_LSB_TAG]: Don't over-align EMACS_INT values.
* src/lisp.h: Include <stdalign.h>.
(GCALIGNMENT): New macro and constant.
(DECL_ALIGN): Remove. All uses replaced by alignas (GCALIGNMENT).
(USE_LSB_TAG): ifdef on alignas, not on DECL_ALIGN.
(stdalign): New macro, if not already defined.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 7 | ||||
| -rw-r--r-- | msdos/sed2v2.inp | 1 | ||||
| -rw-r--r-- | msdos/sedlibmk.inp | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 85251afef05..c5b509c72af 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,10 @@ +2012-07-28 Paul Eggert <eggert@cs.ucla.edu> + + Use Gnulib stdalign module (Bug#9772, Bug#9960). + * sed2v2.inp (HAVE_ATTRIBUTE_ALIGNED): Remove edit. + * sedlibmk.inp (STDALIGN_H, @GL_GENERATE_STDALIGN_H_TRUE@) + (GL_GENERATE_STDALIGN_H_FALSE): New edits. + 2012-07-14 Eli Zaretskii <eliz@gnu.org> * sed1v2.inp: In the recipe for $(leimdir)/leim-list.el, edit the diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 759418f0f15..214480a27ab 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -35,7 +35,6 @@ /^#undef HAVE_FREXP *$/s/^.*$/#define HAVE_FREXP 1/ /^#undef HAVE_FMOD *$/s/^.*$/#define HAVE_FMOD 1/ /^#undef HAVE_RINT *$/s/^.*$/#define HAVE_RINT 1/ -/^#undef HAVE_ATTRIBUTE_ALIGNED *$/s/^.*$/#define HAVE_ATTRIBUTE_ALIGNED 1/ /^#undef HAVE_C99_STRTOLD *$/s/^.*$/#define HAVE_C99_STRTOLD 1/ /^#undef HAVE_CBRT *$/s/^.*$/#define HAVE_CBRT 1/ /^#undef HAVE_DIFFTIME *$/s/^.*$/#define HAVE_DIFFTIME 1/ diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index 432749af92a..b5b66753bb3 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -647,6 +647,8 @@ s/^@GL_GENERATE_ALLOCA_H_TRUE@// s/^@GL_GENERATE_ALLOCA_H_FALSE@/\#/ s/^@GL_GENERATE_STDBOOL_H_TRUE@/\#/ s/^@GL_GENERATE_STDBOOL_H_FALSE@// +s/^@GL_GENERATE_STDALIGN_H_TRUE@// +s/^@GL_GENERATE_STDALIGN_H_FALSE@/\#/ s/^@GL_GENERATE_STDARG_H_TRUE@/\#/ s/^@GL_GENERATE_STDARG_H_FALSE@/\#/ s/^@GL_GENERATE_STDDEF_H_TRUE@/\#/ |