Message ID | 20190715091103.4030-1-iii@linux.ibm.com |
---|---|
State | Accepted |
Delegated to: | BPF Maintainers |
Headers | show |
Series | [bpf] samples/bpf: build with -D__TARGET_ARCH_$(SRCARCH) | expand |
On Mon, Jul 15, 2019 at 2:11 AM Ilya Leoshkevich <iii@linux.ibm.com> wrote: > > While $ARCH can be relatively flexible (see Makefile and > tools/scripts/Makefile.arch), $SRCARCH always corresponds to a directory > name under arch/. > > Therefore, build samples with -D__TARGET_ARCH_$(SRCARCH), since that > matches the expectations of bpf_helpers.h. > > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > Acked-by: Vasily Gorbik <gor@linux.ibm.com> > --- Acked-by: Andrii Nakryiko <andriin@fb.com> > samples/bpf/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile > index f90daadfbc89..1d9be26b4edd 100644 > --- a/samples/bpf/Makefile > +++ b/samples/bpf/Makefile > @@ -284,7 +284,7 @@ $(obj)/%.o: $(src)/%.c > $(Q)$(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) -I$(obj) \ > -I$(srctree)/tools/testing/selftests/bpf/ \ > -D__KERNEL__ -D__BPF_TRACING__ -Wno-unused-value -Wno-pointer-sign \ > - -D__TARGET_ARCH_$(ARCH) -Wno-compare-distinct-pointer-types \ > + -D__TARGET_ARCH_$(SRCARCH) -Wno-compare-distinct-pointer-types \ > -Wno-gnu-variable-sized-type-not-at-end \ > -Wno-address-of-packed-member -Wno-tautological-compare \ > -Wno-unknown-warning-option $(CLANG_ARCH_ARGS) \ > -- > 2.21.0 >
On 7/15/19 11:11 AM, Ilya Leoshkevich wrote: > While $ARCH can be relatively flexible (see Makefile and > tools/scripts/Makefile.arch), $SRCARCH always corresponds to a directory > name under arch/. > > Therefore, build samples with -D__TARGET_ARCH_$(SRCARCH), since that > matches the expectations of bpf_helpers.h. > > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > Acked-by: Vasily Gorbik <gor@linux.ibm.com> Applied, thanks!
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index f90daadfbc89..1d9be26b4edd 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -284,7 +284,7 @@ $(obj)/%.o: $(src)/%.c $(Q)$(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) -I$(obj) \ -I$(srctree)/tools/testing/selftests/bpf/ \ -D__KERNEL__ -D__BPF_TRACING__ -Wno-unused-value -Wno-pointer-sign \ - -D__TARGET_ARCH_$(ARCH) -Wno-compare-distinct-pointer-types \ + -D__TARGET_ARCH_$(SRCARCH) -Wno-compare-distinct-pointer-types \ -Wno-gnu-variable-sized-type-not-at-end \ -Wno-address-of-packed-member -Wno-tautological-compare \ -Wno-unknown-warning-option $(CLANG_ARCH_ARGS) \