From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: bpf <bpf@vger.kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Sam Ravnborg <sam@ravnborg.org>,
linux-kernel@vger.kernel.org,
Masahiro Yamada <masahiroy@kernel.org>
Subject: [PATCH v2 03/15] bpfilter: use 'userprogs' syntax to build bpfilter_umh
Date: Wed, 29 Apr 2020 12:45:15 +0900 [thread overview]
Message-ID: <20200429034527.590520-4-masahiroy@kernel.org> (raw)
In-Reply-To: <20200429034527.590520-1-masahiroy@kernel.org>
The user mode helper should be compiled for the same architecture as
the kernel.
This Makefile reused the 'hostprogs' syntax by overriding HOSTCC with CC.
Use the new syntax 'userprogs' to fix the Makefile mess.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
---
Changes in v2: None
net/bpfilter/Makefile | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/net/bpfilter/Makefile b/net/bpfilter/Makefile
index f6209e4827b9..f23b53294fba 100644
--- a/net/bpfilter/Makefile
+++ b/net/bpfilter/Makefile
@@ -3,18 +3,14 @@
# Makefile for the Linux BPFILTER layer.
#
-hostprogs := bpfilter_umh
+userprogs := bpfilter_umh
bpfilter_umh-objs := main.o
-KBUILD_HOSTCFLAGS += -I $(srctree)/tools/include/ -I $(srctree)/tools/include/uapi \
- $(filter -m32 -m64, $(KBUILD_CFLAGS))
-HOSTCC := $(CC)
+userccflags += -I $(srctree)/tools/include/ -I $(srctree)/tools/include/uapi
-ifeq ($(CONFIG_BPFILTER_UMH), y)
-# builtin bpfilter_umh should be compiled with -static
+# builtin bpfilter_umh should be linked with -static
# since rootfs isn't mounted at the time of __init
# function is called and do_execv won't find elf interpreter
-KBUILD_HOSTLDFLAGS += -static $(filter -m32 -m64, $(KBUILD_CFLAGS))
-endif
+userldflags += -static
$(obj)/bpfilter_umh_blob.o: $(obj)/bpfilter_umh
--
2.25.1
next prev parent reply other threads:[~2020-04-29 3:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 3:45 [PATCH v2 00/15] kbuild: support 'userprogs' syntax Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 01/15] bpfilter: match bit size of bpfilter_umh to that of the kernel Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 02/15] kbuild: add infrastructure to build userspace programs Masahiro Yamada
2020-04-29 3:45 ` Masahiro Yamada [this message]
2020-04-29 3:45 ` [PATCH v2 04/15] samples: seccomp: build sample programs for target architecture Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 05/15] kbuild: doc: document the new syntax 'userprogs' Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 06/15] samples: uhid: fix warnings in uhid-example Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 07/15] samples: uhid: build sample program for target architecture Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 08/15] samples: hidraw: " Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 09/15] samples: connector: " Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 10/15] samples: vfs: build sample programs " Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 11/15] samples: pidfd: build sample program " Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 12/15] samples: mei: " Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 13/15] samples: auxdisplay: use 'userprogs' syntax Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 14/15] samples: timers: " Masahiro Yamada
2020-04-29 3:45 ` [PATCH v2 15/15] samples: watchdog: " Masahiro Yamada
2020-05-12 4:34 ` [PATCH v2 00/15] kbuild: support " Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200429034527.590520-4-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=arnd@arndb.de \
--cc=bpf@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sam@ravnborg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).