logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 763c8937cba78cde21f2d4b2c61b36a32b49b596
parent 1eecc5fbfc807226503c0df0de83c323aed3b121
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 13 Feb 2020 01:11:41 -0800

musl: Apply patch to always use __builtin_alloca

Diffstat:

M.gitmodules1+
Apkg/musl/patch/0001-unconditonally-define-alloca-as-__builtin_alloca.patch31+++++++++++++++++++++++++++++++
Mpkg/musl/ver2+-
3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules @@ -171,6 +171,7 @@ [submodule "pkg/musl/src"] path = pkg/musl/src url = git://git.musl-libc.org/musl + ignore = all [submodule "pkg/ncompress/src"] path = pkg/ncompress/src url = https://github.com/vapier/ncompress.git diff --git a/pkg/musl/patch/0001-unconditonally-define-alloca-as-__builtin_alloca.patch b/pkg/musl/patch/0001-unconditonally-define-alloca-as-__builtin_alloca.patch @@ -0,0 +1,31 @@ +From 6713ec14544e51af61ac40b01b0021df791b38ea Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Tue, 19 Nov 2019 01:56:34 -0800 +Subject: [PATCH] unconditonally define alloca as __builtin_alloca + +This enables alternative compilers, which may not define __GNUC__, +to implement alloca, which is still fairly widely used. + +This is similar to how stdarg.h already works in musl; compilers must +implement __builtin_va_arg, there is no fallback definition. +--- + include/alloca.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/include/alloca.h b/include/alloca.h +index d2e6f1c6..b8d183d1 100644 +--- a/include/alloca.h ++++ b/include/alloca.h +@@ -10,9 +10,7 @@ extern "C" { + + void *alloca(size_t); + +-#ifdef __GNUC__ + #define alloca __builtin_alloca +-#endif + + #ifdef __cplusplus + } +-- +2.25.0 + diff --git a/pkg/musl/ver b/pkg/musl/ver @@ -1 +1 @@ -1.1.24 r0 +1.1.24 r1