Module Name:    src
Committed By:   christos
Date:           Sun Aug 25 22:10:41 UTC 2024

Modified Files:
        src/distrib/sets/lists/comp: mi
        src/include: Makefile
        src/sys/sys: Makefile
Added Files:
        src/sys/sys: stdalign.h
Removed Files:
        src/include: stdalign.h

Log Message:
PR/58640: Riastradh: Provide sys/stdalign.h


To generate a diff of this commit:
cvs rdiff -u -r1.2471 -r1.2472 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.147 -r1.148 src/include/Makefile
cvs rdiff -u -r1.1 -r0 src/include/stdalign.h
cvs rdiff -u -r1.183 -r1.184 src/sys/sys/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/sys/stdalign.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2471 src/distrib/sets/lists/comp/mi:1.2472
--- src/distrib/sets/lists/comp/mi:1.2471	Sun Aug 18 00:09:51 2024
+++ src/distrib/sets/lists/comp/mi	Sun Aug 25 18:10:40 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2471 2024/08/18 04:09:51 rin Exp $
+#	$NetBSD: mi,v 1.2472 2024/08/25 22:10:40 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -3585,6 +3585,7 @@
 ./usr/include/sys/specificdata.h		comp-c-include
 ./usr/include/sys/stat.h			comp-c-include
 ./usr/include/sys/statvfs.h			comp-c-include
+./usr/include/sys/stdalign.h			comp-c-include
 ./usr/include/sys/stdarg.h			comp-c-include
 ./usr/include/sys/stdbool.h			comp-c-include
 ./usr/include/sys/stdint.h			comp-c-include

Index: src/include/Makefile
diff -u src/include/Makefile:1.147 src/include/Makefile:1.148
--- src/include/Makefile:1.147	Thu Aug 15 09:14:44 2024
+++ src/include/Makefile	Sun Aug 25 18:10:40 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.147 2024/08/15 13:14:44 riastradh Exp $
+#	$NetBSD: Makefile,v 1.148 2024/08/25 22:10:40 christos Exp $
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
 
 # Doing a make includes builds /usr/include
@@ -18,7 +18,7 @@ INCS=	a.out.h aio.h ar.h assert.h atomic
 	ndbm.h netconfig.h netdb.h netgroup.h nlist.h nl_types.h nsswitch.h \
 	paths.h pwd.h quota.h randomid.h ranlib.h re_comp.h regex.h regexp.h \
 	resolv.h res_update.h rmt.h sched.h search.h semaphore.h setjmp.h \
-	string.h sgtty.h signal.h spawn.h stab.h stdalign.h stddef.h stdio.h \
+	string.h sgtty.h signal.h spawn.h stab.h stddef.h stdio.h \
 	stdlib.h stdnoreturn.h strings.h stringlist.h struct.h sysexits.h \
 	tar.h time.h ttyent.h tzfile.h \
 	uchar.h \

Index: src/sys/sys/Makefile
diff -u src/sys/sys/Makefile:1.183 src/sys/sys/Makefile:1.184
--- src/sys/sys/Makefile:1.183	Sun Oct 15 09:04:15 2023
+++ src/sys/sys/Makefile	Sun Aug 25 18:10:40 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.183 2023/10/15 13:04:15 riastradh Exp $
+#	$NetBSD: Makefile,v 1.184 2024/08/25 22:10:40 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -41,8 +41,8 @@ INCS=	acct.h acl.h agpio.h aio.h ansi.h 
 	sha1.h sha2.h sha3.h shm.h siginfo.h signal.h signalvar.h sigtypes.h \
 	sleepq.h socket.h \
 	socketvar.h sockio.h spawn.h specificdata.h stat.h \
-	statvfs.h syscall.h syscallargs.h sysctl.h stdarg.h stdbool.h \
-	stdint.h swap.h syncobj.h syslimits.h syslog.h \
+	statvfs.h syscall.h syscallargs.h sysctl.h stdalign.h stdarg.h \
+	stdbool.h stdint.h swap.h syncobj.h syslimits.h syslog.h \
 	tape.h termios.h time.h timeb.h timepps.h timerfd.h times.h timespec.h \
 	timex.h tls.h trace.h tree.h tty.h ttychars.h ttycom.h \
 	ttydefaults.h ttydev.h types.h \
@@ -55,6 +55,7 @@ INCSYMLINKS=\
 	sys/exec_elf.h /usr/include/elf.h \
 	sys/fcntl.h /usr/include/fcntl.h \
 	sys/poll.h /usr/include/poll.h \
+	sys/stdalign.h /usr/include/stdalign.h \
 	sys/stdarg.h /usr/include/stdarg.h \
 	sys/stdbool.h /usr/include/stdbool.h \
 	sys/stdint.h /usr/include/stdint.h \

Added files:

Index: src/sys/sys/stdalign.h
diff -u /dev/null src/sys/sys/stdalign.h:1.1
--- /dev/null	Sun Aug 25 18:10:41 2024
+++ src/sys/sys/stdalign.h	Sun Aug 25 18:10:40 2024
@@ -0,0 +1,55 @@
+/*	$NetBSD: stdalign.h,v 1.1 2024/08/25 22:10:40 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2016 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Kamil Rytarowski.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _SYS_STDALIGN_H_
+#define _SYS_STDALIGN_H_
+
+/*-
+ * ISO/IEC 9899:201x 7.15 Alignment <stdalign.h>
+ * ISO/IEC N3242=11-0012 (C++1x) 18.10 Other runtime support 6.
+ * ISO/IEC N3797 (C++1y) 18.10 Other runtime support 7.
+ */
+
+#ifndef __alignas_is_defined
+#if ((__cplusplus - 0) < 201103L)
+#define alignas	_Alignas
+#endif
+#define __alignas_is_defined 1
+#endif /* __alignas_is_defined */
+
+#ifndef __alignof_is_defined
+#if ((__cplusplus - 0) < 201103L)
+#define alignof	_Alignof
+#endif
+#define __alignof_is_defined 1
+#endif /* __alignof_is_defined */
+
+#endif

Reply via email to