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@/\#/