From patchwork Fri Jun 8 17:12:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 926932 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=socionext.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.b="XyXVS+t7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 412ThG1B1Bz9s1B for ; Sat, 9 Jun 2018 03:20:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932181AbeFHRUn (ORCPT ); Fri, 8 Jun 2018 13:20:43 -0400 Received: from condef-03.nifty.com ([202.248.20.68]:44446 "EHLO condef-03.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932130AbeFHRUl (ORCPT ); Fri, 8 Jun 2018 13:20:41 -0400 Received: from conuserg-10.nifty.com ([10.126.8.73])by condef-03.nifty.com with ESMTP id w58HD1xA021319 for ; Sat, 9 Jun 2018 02:13:01 +0900 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-10.nifty.com with ESMTP id w58HCbWF008555; Sat, 9 Jun 2018 02:12:40 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w58HCbWF008555 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1528477960; bh=sFOR8yPtAuS5GqeUxlJjV5u9vMKxeK8qrl3vZ67e+B8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XyXVS+t7bL0S4pTNtX4JYs8XZw7iQqbNG/93vjhxGbk4g0299O91tGr2RyE0RRPfN 9CyEpQ/4nLuTtTupdchKKmiIeLbK/1Vc5AUikQNk7/UaAMuuWA+OtZ7U+cAwk7t118 aTSP6XnA7hFZSLxJgg58BvL3moI75Rz+xNASLUCaVAZcSuRNTVBC4CzTbgtCChaByJ BL3K28mJT6kqNO+qdGCx+sN4Ru9g01AilX6E3r6PP58TdLoixZSecu+TANRk9XFi+E ch3lJM043w/GXpL2NJYsb4LIdDFXQKFS5YfXd4ARxGCdYjDB3k2v7Il/1tJ7+U6upn XcjEAyvQ3Of2w== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: netdev@vger.kernel.org, Alexei Starovoitov , "David S . Miller" Cc: Arnd Bergmann , Geert Uytterhoeven , linux-kernel@vger.kernel.org, Masahiro Yamada , YueHaibing Subject: [PATCH 3/3] bpfilter: do not (ab)use host-program build rule Date: Sat, 9 Jun 2018 02:12:10 +0900 Message-Id: <1528477930-7342-4-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528477930-7342-1-git-send-email-yamada.masahiro@socionext.com> References: <1528477930-7342-1-git-send-email-yamada.masahiro@socionext.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It is an ugly hack to overwrite $(HOSTCC) with $(CC) to reuse the build rules from scripts/Makefile.host. It should not be tedious to write a build rule for its own. Signed-off-by: Masahiro Yamada --- net/bpfilter/Makefile | 17 +++++++++++------ net/bpfilter/{main.c => bpfilter_umh.c} | 0 2 files changed, 11 insertions(+), 6 deletions(-) rename net/bpfilter/{main.c => bpfilter_umh.c} (100%) diff --git a/net/bpfilter/Makefile b/net/bpfilter/Makefile index 39c6980..6571b30 100644 --- a/net/bpfilter/Makefile +++ b/net/bpfilter/Makefile @@ -3,18 +3,23 @@ # Makefile for the Linux BPFILTER layer. # -hostprogs-y := bpfilter_umh -bpfilter_umh-objs := main.o -HOSTCFLAGS += -I. -Itools/include/ -Itools/include/uapi -HOSTCC := $(CC) - ifeq ($(CONFIG_BPFILTER_UMH), y) # builtin bpfilter_umh should be compiled with -static # since rootfs isn't mounted at the time of __init # function is called and do_execv won't find elf interpreter -HOSTLDFLAGS += -static +STATIC := -static endif +quiet_cmd_cc_user = CC $@ + cmd_cc_user = $(CC) -Wall -Wmissing-prototypes -O2 -std=gnu89 \ + -I$(srctree) -I$(srctree)/tools/include/ \ + -I$(srctree)/tools/include/uapi $(STATIC) -o $@ $< + +$(obj)/bpfilter_umh: $(src)/bpfilter_umh.c FORCE + $(call if_changed,cc_user) + +targets += bpfilter_umh + $(obj)/bpfilter_umh_blob.o: $(obj)/bpfilter_umh obj-$(CONFIG_BPFILTER_UMH) += bpfilter.o diff --git a/net/bpfilter/main.c b/net/bpfilter/bpfilter_umh.c similarity index 100% rename from net/bpfilter/main.c rename to net/bpfilter/bpfilter_umh.c