From 6b337ae478422e43ae64e6eac93a4270c3253ed7 Mon Sep 17 00:00:00 2001 From: Jean-Sébastien Pédron Date: Mon, 30 Jul 2018 09:14:40 +0000 Subject: lang/erlang-runtime{20,21}: Add patch to fix build on i386 Those two ports fail to build on FreeBSD/i386 (all versions) for quite some time. The Erlang/OTP team provided a patch after Dewayne Geraghty reported the issue upstream. Here is the entry in the Erlang/OTP bug tracker: https://bugs.erlang.org/browse/ERL-677 The patch was successfully tested on FreeBSD 10.4 and 11.1, both i386 and amd64. Dewayne also confirmed success on FreeBSD 11.2. PR: 229600 Reported by: Dewayne Geraghty Obtained from: https://bugs.erlang.org/browse/ERL-677 MFH: 2018Q3 --- .../files/patch-erts_emulator_beam_erl__alloc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c (limited to 'lang/erlang-runtime20/files') diff --git a/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c b/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c new file mode 100644 index 000000000000..b464b57ca736 --- /dev/null +++ b/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c @@ -0,0 +1,11 @@ +--- erts/emulator/beam/erl_alloc.c.orig 2018-03-13 20:11:05 UTC ++++ erts/emulator/beam/erl_alloc.c +@@ -122,7 +122,7 @@ typedef union { + char align_afa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AFAllctr_t))]; + AOFFAllctr_t aoffa; + char align_aoffa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AOFFAllctr_t))]; +-} ErtsAllocatorState_t; ++} ErtsAllocatorState_t erts_align_attribute(ERTS_CACHE_LINE_SIZE); + + static ErtsAllocatorState_t std_alloc_state; + static ErtsAllocatorState_t ll_alloc_state; -- cgit