mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-19 01:05:15 +03:00
1780a0dfdf
There was a regression td-agent-bit that broke a function on ppc64le. This patch fixes it. This patch was also sent uptream, as: https://github.com/fluent/fluent-bit/pull/253
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From a0dfda11ab576da7b3c931f7512fa77b86d95209 Mon Sep 17 00:00:00 2001
|
|
From: Breno Leitao <breno.leitao@gmail.com>
|
|
Date: Mon, 8 May 2017 19:36:43 +0000
|
|
Subject: [PATCH] lib: flb_libco: Fix ppc64 function arguments
|
|
|
|
This software currently does not built on Power due to duplicated
|
|
function.
|
|
|
|
lib/flb_libco/ppc.c:282:12: error: conflicting types for 'co_create'
|
|
cothread_t co_create(unsigned int size, void (*entry_)(void)) {
|
|
|
|
lib/flb_libco/libco.h:19:12: note: previous declaration of 'co_create' was here
|
|
cothread_t co_create(unsigned int, void (*)(void), size_t *);
|
|
|
|
This is happening because commit
|
|
b2bb2227cd2712df1946c438ec733b5956e9ecd8 forgot to change the function
|
|
name on ppc source code.
|
|
|
|
Signed-off-by: Breno Leitao <breno.leitao@gmail.com>
|
|
---
|
|
lib/flb_libco/ppc.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/flb_libco/ppc.c b/lib/flb_libco/ppc.c
|
|
index e6536d56..8b70ad77 100755
|
|
--- a/lib/flb_libco/ppc.c
|
|
+++ b/lib/flb_libco/ppc.c
|
|
@@ -279,7 +279,8 @@ static uint32_t* co_create_(unsigned size, uintptr_t entry) {
|
|
return t;
|
|
}
|
|
|
|
-cothread_t co_create(unsigned int size, void (*entry_)(void)) {
|
|
+cothread_t co_create(unsigned int size, void (*entry_)(void),
|
|
+ size_t *out_size) {
|
|
uintptr_t entry = (uintptr_t)entry_;
|
|
uint32_t* t = 0;
|
|
|
|
@@ -289,6 +290,7 @@ cothread_t co_create(unsigned int size, void (*entry_)(void)) {
|
|
t = co_create_(size, entry);
|
|
}
|
|
|
|
+ *out_size = size;
|
|
if(t) {
|
|
uintptr_t sp;
|
|
int shift;
|
|
--
|
|
2.12.2
|
|
|