2019-12-27 02:42:57

by Shile Zhang

Subject: [PATCH] libbpf: Use $(SRCARCH) for include path

To include right x86 centric include path for ARCH=x86_64.

Signed-off-by: Shile Zhang <[email protected]>
---
tools/lib/bpf/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
index defae23a0169..197d96886303 100644
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@ -59,7 +59,7 @@ FEATURE_USER = .libbpf
FEATURE_TESTS = libelf libelf-mmap bpf reallocarray
FEATURE_DISPLAY = libelf bpf

-INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi -I$(srctree)/tools/include/uapi
+INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi -I$(srctree)/tools/include/uapi
FEATURE_CHECK_CFLAGS-bpf = $(INCLUDES)

check_feat := 1
--
2.24.0.rc2

2019-12-30 05:23:12

by Andrii Nakryiko

Subject: Re: [PATCH] libbpf: Use $(SRCARCH) for include path

On Thu, Dec 26, 2019 at 6:42 PM Shile Zhang
<[email protected]> wrote:
>
> To include right x86 centric include path for ARCH=x86_64.
>
> Signed-off-by: Shile Zhang <[email protected]>
> ---
> tools/lib/bpf/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
> index defae23a0169..197d96886303 100644
> --- a/tools/lib/bpf/Makefile
> +++ b/tools/lib/bpf/Makefile
> @@ -59,7 +59,7 @@ FEATURE_USER = .libbpf
> FEATURE_TESTS = libelf libelf-mmap bpf reallocarray
> FEATURE_DISPLAY = libelf bpf
>
> -INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi -I$(srctree)/tools/include/uapi
> +INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi -I$(srctree)/tools/include/uapi

Is this breaking anything at all right now? I just tried removing
arch-specific include and everything still compiled successfully. So
maybe instead let's just drop arch-specific include path?

> FEATURE_CHECK_CFLAGS-bpf = $(INCLUDES)
>
> check_feat := 1
> --
> 2.24.0.rc2
>

2019-12-30 06:31:43

by Shile Zhang

Subject: Re: [PATCH] libbpf: Use $(SRCARCH) for include path

On 2019/12/30 13:21, Andrii Nakryiko wrote:
> On Thu, Dec 26, 2019 at 6:42 PM Shile Zhang
> <[email protected]> wrote:
>> To include right x86 centric include path for ARCH=x86_64.
>>
>> Signed-off-by: Shile Zhang <[email protected]>
>> ---
>> tools/lib/bpf/Makefile | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
>> index defae23a0169..197d96886303 100644
>> --- a/tools/lib/bpf/Makefile
>> +++ b/tools/lib/bpf/Makefile
>> @@ -59,7 +59,7 @@ FEATURE_USER = .libbpf
>> FEATURE_TESTS = libelf libelf-mmap bpf reallocarray
>> FEATURE_DISPLAY = libelf bpf
>>
>> -INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi -I$(srctree)/tools/include/uapi
>> +INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi -I$(srctree)/tools/include/uapi
> Is this breaking anything at all right now? I just tried removing
> arch-specific include and everything still compiled successfully. So
> maybe instead let's just drop arch-specific include path?
>

No compile error/warning, but just include wrong (non-existed) include path.
I think it's OK to drop it if that path is needless.

Thanks!

>> FEATURE_CHECK_CFLAGS-bpf = $(INCLUDES)
>>
>> check_feat := 1
>> --
>> 2.24.0.rc2
>>