From dcc6ef1644423a970fa515feef81730135e1d87f Mon Sep 17 00:00:00 2001
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 14 May 2020 21:12:08 +0000
Subject: [PATCH] Add memalign(3), mostly for glibc compatibility.

Reviewed by:	emaste, imp (previous version)
Sponsored by:	The FreeBSD Foundation
MFC after:	2 weeks
Differential revision:	https://reviews.freebsd.org/D24307
---
 include/malloc_np.h       |  3 +++
 lib/libc/gen/Makefile.inc |  1 +
 lib/libc/gen/Symbol.map   |  1 +
 lib/libc/gen/memalign.c   | 40 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+)
 create mode 100644 lib/libc/gen/memalign.c

diff --git a/include/malloc_np.h b/include/malloc_np.h
index fc91cdbf9a90..94c7026ef10f 100644
--- a/include/malloc_np.h
+++ b/include/malloc_np.h
@@ -122,6 +122,9 @@ size_t	__sallocx(const void *ptr, int flags);
 void	__dallocx(void *ptr, int flags);
 void	__sdallocx(void *ptr, size_t size, int flags);
 size_t	__nallocx(size_t size, int flags);
+
+void	*memalign(size_t, size_t) __malloc_like __alloc_align(1)
+	    __alloc_size(2);
 __END_DECLS
 
 #undef __MyBool
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 04cedb7a3f73..f86c7b04b92b 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -98,6 +98,7 @@ SRCS+=	__getosreldate.c \
 	libc_dlopen.c \
 	lockf.c \
 	lrand48.c \
+	memalign.c \
 	mrand48.c \
 	nftw.c \
 	nftw-compat11.c \
diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map
index ebcd7667fc65..f9d4f158ed30 100644
--- a/lib/libc/gen/Symbol.map
+++ b/lib/libc/gen/Symbol.map
@@ -423,6 +423,7 @@ FBSD_1.5 {
 };
 
 FBSD_1.6 {
+	memalign;
 	sigandset;
 	sigisemptyset;
 	sigorset;
diff --git a/lib/libc/gen/memalign.c b/lib/libc/gen/memalign.c
new file mode 100644
index 000000000000..ff1c967482cd
--- /dev/null
+++ b/lib/libc/gen/memalign.c
@@ -0,0 +1,40 @@
+/*-
+ * Copyright (c) 2020 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Konstantin Belousov
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <stdlib.h>
+
+void *
+memalign(size_t align, size_t size)
+{
+	return (aligned_alloc(align, roundup(size, align)));
+}