mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 18:19:02 +00:00
5582fbd613
With global NLS support enabled (CONFIG_BUILD_NLS), the linked libelf.so
and libbfd.so libraries will depend on libintl.so. Import the nls.mk helper
to set library prefixes and flags accordingly, and also conditionally add
"-lintl" as link-time library.
Fix a build error on ppc due to a EDEADLOCK redefinition in errno.h.
Use upstream stable kernel 5.8.9, and fix overriding of feature detection
to only allow/hide detected features. Also refresh existing patches.
Fixes: 2f0d672088 ("bpftools: add utility and library packages supporting
eBPF usage")
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
57 lines
2.4 KiB
Diff
57 lines
2.4 KiB
Diff
From afe3f4c765b17ced23811fe652c7f7adf7a0c0cf Mon Sep 17 00:00:00 2001
|
|
From: Tony Ambardar <Tony.Ambardar@gmail.com>
|
|
Date: Mon, 14 Sep 2020 23:05:26 -0700
|
|
Subject: [PATCH] tools/arch/powerpc: fix EDEADLOCK redefinition errors in
|
|
errno.h
|
|
|
|
A few archs like powerpc have different errno.h values for macros
|
|
EDEADLOCK and EDEADLK. In code including both libc and linux versions of
|
|
errno.h, this can result in multiple definitions of EDEADLOCK in the
|
|
include chain. Definitions to the same value (e.g. seen with mips) do
|
|
not raise warnings, but on powerpc there are redefinitions changing the
|
|
value, which raise warnings and errors (with "-Werror").
|
|
|
|
Guard against these redefinitions to avoid build errors like the following,
|
|
first seen cross-compiling libbpf v5.8.9 for powerpc using GCC 8.4.0 with
|
|
musl 1.1.24:
|
|
|
|
In file included from ../../arch/powerpc/include/uapi/asm/errno.h:5,
|
|
from ../../include/linux/err.h:8,
|
|
from libbpf.c:29:
|
|
../../include/uapi/asm-generic/errno.h:40: error: "EDEADLOCK" redefined [-Werror]
|
|
#define EDEADLOCK EDEADLK
|
|
|
|
In file included from toolchain-powerpc_8540_gcc-8.4.0_musl/include/errno.h:10,
|
|
from libbpf.c:26:
|
|
toolchain-powerpc_8540_gcc-8.4.0_musl/include/bits/errno.h:58: note: this is the location of the previous definition
|
|
#define EDEADLOCK 58
|
|
|
|
cc1: all warnings being treated as errors
|
|
make[5]: *** [target-powerpc_8540_musl/bpftools-5.8.9/tools/build/Makefile.build:97: /home/kodidev/openwrt-project/build_dir/target-powerpc_8540_musl/bpftools-minimal/bpftools-5.8.9//libbpf/staticobjs/libbpf.o] Error 1
|
|
|
|
Fixes: 95f28190aa01 ("tools include arch: Grab a copy of errno.h for arch's
|
|
supported by perf")
|
|
Fixes: c3617f72036c ("UAPI: (Scripted) Disintegrate arch/powerpc/include/asm")
|
|
|
|
Reported-by: Rosen Penev <rosenp@gmail.com>
|
|
Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com>
|
|
---
|
|
tools/arch/powerpc/include/uapi/asm/errno.h | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/tools/arch/powerpc/include/uapi/asm/errno.h b/tools/arch/powerpc/include/uapi/asm/errno.h
|
|
index cc79856896a1..4ba87de32be0 100644
|
|
--- a/tools/arch/powerpc/include/uapi/asm/errno.h
|
|
+++ b/tools/arch/powerpc/include/uapi/asm/errno.h
|
|
@@ -2,6 +2,7 @@
|
|
#ifndef _ASM_POWERPC_ERRNO_H
|
|
#define _ASM_POWERPC_ERRNO_H
|
|
|
|
+#undef EDEADLOCK
|
|
#include <asm-generic/errno.h>
|
|
|
|
#undef EDEADLOCK
|
|
--
|
|
2.25.1
|
|
|