Rename module stdalign to stdalign-h.

* modules/stdalign-h: Renamed from modules/stdalign.
* modules/stdalign-h-tests: Renamed from modules/stdalign-tests.
* modules/stdalign-h-c++-tests: Renamed from modules/stdalign-c++-tests.
* tests/test-stdalign-h-c++.cc: Renamed from tests/test-stdalign-c++.cc.
* doc/posix-headers/stdalign.texi: Update.
* modules/stdalign: New file.

diff --git a/ChangeLog b/ChangeLog
index f33ce8ce6c7b8cec6b43ec8cff0b92937f44393c..894222c5550c54203d817651f08cb2a5905edaaa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module stdalign to stdalign-h.
+       * modules/stdalign-h: Renamed from modules/stdalign.
+       * modules/stdalign-h-tests: Renamed from modules/stdalign-tests.
+       * modules/stdalign-h-c++-tests: Renamed from modules/stdalign-c++-tests.
+       * tests/test-stdalign-h-c++.cc: Renamed from tests/test-stdalign-c++.cc.
+       * doc/posix-headers/stdalign.texi: Update.
+       * modules/stdalign: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module spawn to spawn-h.

diff --git a/doc/posix-headers/stdalign.texi b/doc/posix-headers/stdalign.texi
index 57715d3f3f70ad8aacb01b6ebeffd4f3e00d4dbb..fa9c2885afa5e1ad9aedf5a1060314da5d2b27db 100644 (file)
--- a/doc/posix-headers/stdalign.texi
+++ b/doc/posix-headers/stdalign.texi
@@ -18,10 +18,10 @@ On older C platforms @code{<stdalign.h>} must be included before using
 support these keywords, which were standardized by C23.
 On C23 and later platforms, @code{<stdalign.h>} has no effect and need
 not be included.
-@mindex stdalign
+@mindex stdalign-h
 (Gnulib-using code should not include
 @code{<stdalign.h>} without also employing Gnulib's now-deprecated
-@code{stdalign} module.)
+@code{stdalign-h} module.)
 @item
 This header file is missing on many platforms:
 FreeBSD 6.4, NetBSD 7.1, OpenBSD 7.5, Minix 3.3.0, AIX 7.1, HP-UX 11.31, Solaris 11.3, mingw, MSVC 14, Android 9.0.
@@ -43,7 +43,7 @@ In C23, these macros are not defined.
 This portability problem should not matter with code using Gnulib's
 @code{alignasof} module, as such code should use @code{alignas} and
 @code{alignof} without checking these two macros.  (Gnulib's
-now-deprecated @code{stdalign} module defines these two macros.)
+now-deprecated @code{stdalign-h} module defines these two macros.)
 @item
 @c https://github.com/llvm/llvm-project/issues/81472
 Clang 17 does not support an @code{alignas} attribute in the

diff --git a/modules/stdalign b/modules/stdalign
index ceeab546a2f6cddbd22f59addb22639e48dbcdf5..b0f0ebf2e99ff95fdf70b7caf6c70c0cb7d164e9 100644 (file)
--- a/modules/stdalign
+++ b/modules/stdalign
@@ -1,45 +1,20 @@
 Description:
 alignas and alignof that are like C23 and C++11.
 
+Status:
+deprecated
+
 Notice:
-The stdalign module is deprecated.
-New code should use the alignasof module, and not include <stdalign.h>.
+This module is deprecated. Use the module 'stdalign-h' instead.
 
 Files:
-lib/stdalign.in.h
-m4/stdalign.m4
 
 Depends-on:
-alignasof
-gen-header
+stdalign-h
 
 configure.ac:
-gl_STDALIGN_H
-gl_CONDITIONAL_HEADER([stdalign.h])
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += $(STDALIGN_H)
-
-# We need the following in order to create <stdalign.h> when the system
-# doesn't have one that works.
-if GL_GENERATE_STDALIGN_H
-stdalign.h: stdalign.in.h $(top_builddir)/config.status
-@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
-       $(gl_V_at)$(SED_HEADER_STDOUT) \
-             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-             -e 's|@''HAVE_STDALIGN_H''@|$(HAVE_STDALIGN_H)|g' \
-             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-             -e 's|@''NEXT_STDALIGN_H''@|$(NEXT_STDALIGN_H)|g' \
-             $(srcdir)/stdalign.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-else
-stdalign.h: $(top_builddir)/config.status
-       rm -f $@
-endif
-MOSTLYCLEANFILES += stdalign.h stdalign.h-t
 
 Include:
 
@@ -47,4 +22,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all

diff --git a/modules/stdalign-c++-tests b/modules/stdalign-c++-tests
deleted file mode 100644 (file)
index bc7a1f7..0000000
--- a/modules/stdalign-c++-tests
+++ /dev/null
@@ -1,17 +0,0 @@
-Files:
-tests/test-stdalign-c++.cc
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-stdalign-c++
-check_PROGRAMS += test-stdalign-c++
-test_stdalign_c___SOURCES = test-stdalign-c++.cc
-endif

diff --git a/modules/stdalign-h b/modules/stdalign-h
new file mode 100644 (file)
index 0000000..ceeab54
--- /dev/null
+++ b/modules/stdalign-h
@@ -0,0 +1,50 @@
+Description:
+alignas and alignof that are like C23 and C++11.
+
+Notice:
+The stdalign module is deprecated.
+New code should use the alignasof module, and not include <stdalign.h>.
+
+Files:
+lib/stdalign.in.h
+m4/stdalign.m4
+
+Depends-on:
+alignasof
+gen-header
+
+configure.ac:
+gl_STDALIGN_H
+gl_CONDITIONAL_HEADER([stdalign.h])
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += $(STDALIGN_H)
+
+# We need the following in order to create <stdalign.h> when the system
+# doesn't have one that works.
+if GL_GENERATE_STDALIGN_H
+stdalign.h: stdalign.in.h $(top_builddir)/config.status
+@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
+       $(gl_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -e 's|@''HAVE_STDALIGN_H''@|$(HAVE_STDALIGN_H)|g' \
+             -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+             -e 's|@''NEXT_STDALIGN_H''@|$(NEXT_STDALIGN_H)|g' \
+             $(srcdir)/stdalign.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+else
+stdalign.h: $(top_builddir)/config.status
+       rm -f $@
+endif
+MOSTLYCLEANFILES += stdalign.h stdalign.h-t
+
+Include:
+
+License:
+LGPLv2+
+
+Maintainer:
+all

diff --git a/modules/stdalign-h-c++-tests b/modules/stdalign-h-c++-tests
new file mode 100644 (file)
index 0000000..d631e99
--- /dev/null
+++ b/modules/stdalign-h-c++-tests
@@ -0,0 +1,17 @@
+Files:
+tests/test-stdalign-h-c++.cc
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-stdalign-h-c++
+check_PROGRAMS += test-stdalign-h-c++
+test_stdalign_h_c___SOURCES = test-stdalign-h-c++.cc
+endif

diff --git a/modules/stdalign-tests b/modules/stdalign-h-tests
similarity index 75%
rename from modules/stdalign-tests
rename to modules/stdalign-h-tests
index 2a0d486d775b0d76ea38f19750cf71a4238b3eb9..60fb9f51f6563784db00d340c058f2ca8da85cef 100644 (file)
--- a/modules/stdalign-tests
+++ b/modules/stdalign-h-tests
@@ -2,7 +2,7 @@ Files:
 
 Depends-on:
 alignasof-tests
-stdalign-c++-tests
+stdalign-h-c++-tests
 
 configure.ac:
 

diff --git a/tests/test-stdalign-c++.cc b/tests/test-stdalign-h-c++.cc
similarity index 100%
rename from tests/test-stdalign-c++.cc
rename to tests/test-stdalign-h-c++.cc