From patchwork Sun Aug 25 17:28:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 172157 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3351834ily; Sun, 25 Aug 2019 10:31:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqxJBdITXlyCQRIATaEO9jYFKg/DLBZVk86O9P5s+7Pl67mwgY1L17tRDSUlCnLWZIfhWbGu X-Received: by 2002:a65:5786:: with SMTP id b6mr12749624pgr.236.1566754271231; Sun, 25 Aug 2019 10:31:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566754271; cv=none; d=google.com; s=arc-20160816; b=KrBrSI5IzCWfAa6dgV4TNXqg1N1GgWDvzGpG/Zmg3Pgd9kmhe46xsrMkyQ5nYtjVvx x1qu/GSHZc78N4sCKNmgSYdpD664/9yKGxb3d9EMXT3WnUm123HFt28Wf7IS1x+kWSHh 1pypAqqVcz6fjBNJNeWKwKYIyaRl5c7eAPyeRmdJM2GInwq5Hjq9TOSa61w4MJvxEHUy g4WNJFDfA9yzwuHNdnrzBXiRDHpk0QtGtGLByOQHQOxREPJUap4Bars1pZpJBhDw7/Iy YwTnNfX5G12k8igpzu0RF1T/KG4zD7WriHgIxV/R9wh3RwORo3x8LzN889i3pmYkMAIx wPrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=O8rVg1SxjWnsiBqfyChLy0jNlbeiFProErHAOQpA2Mo=; b=dQOWBjt1TTEUA72jB0cSfgNlVEXmBJ6bLF3zdNI5kyfPbZ7FYu1FSpEAE/5Xlw+Cj/ NUHxd9Vf/oyxUiKwncomgjDeCGQzQZ6ZqItufPMCZEAOp0BP3DFCUqE08hosJzFNZ2A2 aQPLThrS000+tcl/oYLftHS/HO7xkEP4pSflxiB/AU14ZHTp9mROb9oPs2L538ift0Bh Cz0lkx+vIULBsORHiqoK+8pHzP9lNt9SdDEKmS3ekZBJrLEFNY6Xz6TKjbcsLl8XRoyO UYOyrvhuV6j108bj+qVXL/V8CZsmAuxGcjR3HdAp0iq/K5E0iXT/9vSutqzlU8DI37ON U0+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b="z/jVUTMr"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y16si7919055pfc.51.2019.08.25.10.31.10; Sun, 25 Aug 2019 10:31:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b="z/jVUTMr"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728758AbfHYRbJ (ORCPT + 28 others); Sun, 25 Aug 2019 13:31:09 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:47557 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728467AbfHYRbJ (ORCPT ); Sun, 25 Aug 2019 13:31:09 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-11.nifty.com with ESMTP id x7PHSb7O010019; Mon, 26 Aug 2019 02:28:37 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x7PHSb7O010019 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1566754118; bh=O8rVg1SxjWnsiBqfyChLy0jNlbeiFProErHAOQpA2Mo=; h=From:To:Cc:Subject:Date:From; b=z/jVUTMrEkyDDPZkmEQd2+urd8daK8IpIY1QBUGfpE718vIjykWHonuzimvizeyeZ IdFkT0v6FNX5pDQg5MmUnhGQ6Q1LdcjolG3E2rLgotthLHKMdi3V4ZUgdCKWm1TI8l KbpJJtIeq7hqmkAN4QFqzyjK9GpswiZ+sS3vjovXmXYKZgwa+Sgidl6jFvA8Bl5jD2 YhVWU7aOianmGiV3S0rX+sGuf8dONVyX7gLex5yXHZbk25GyYYQc9yzDAeG66pxDyq XqNG9O2xKt/FIQDw3L5YcqjKYAwgeaUom5z9b6mUozIZVlOp112GOVjzEJpjyTTEz/ LUoSsVVi8hZjw== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Andy Lutomirski , Borislav Petkov , "H. Peter Anvin" , Ingo Molnar , James Morse , Julien Thierry , Marc Zyngier , Michal Marek , Russell King , Suzuki K Poulose , Thomas Gleixner , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, x86@kernel.org Subject: [PATCH 1/2] kbuild: change *FLAGS_.o to take the path relative to $(obj) Date: Mon, 26 Aug 2019 02:28:32 +0900 Message-Id: <20190825172833.5708-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Kbuild provides per-file compiler flag addition/removal: CFLAGS_.o CFLAGS_REMOVE_.o AFLAGS_.o AFLAGS_REMOVE_.o CPPFLAGS_ HOSTCFLAGS_.o HOSTCXXFLAGS_.o The is the filename of the target without its suffix. This syntax comes into a trouble when two files with the same name appear in one Makefile, for example: obj-y += foo.o obj-y += dir/foo.o CFLAGS_foo.o := Here, the applies to both foo.o and dir/foo.o The real world problem is: scripts/kconfig/util.c scripts/kconfig/lxdialog/util.c Both files are compiled into scripts/kconfig/mconf, but only the latter should be given with additional flags for ncurses. It is more sensible to use the relative path to the Makefile, like this: obj-y += foo.o CFLAGS_foo.o := obj-y += dir/foo.o CFLAGS_dir/foo.o := The $* variable is replaced with the stem ('%') part in a pattern rule. In other words, this only works for pattern rules. Signed-off-by: Masahiro Yamada --- arch/arm/kvm/Makefile | 5 +++-- arch/x86/entry/vdso/Makefile | 3 ++- scripts/Makefile.host | 30 +++++++++++++++--------------- scripts/Makefile.lib | 10 +++++----- scripts/kconfig/Makefile | 8 ++++---- 5 files changed, 29 insertions(+), 27 deletions(-) -- 2.17.1 Acked-by: Marc Zyngier diff --git a/arch/arm/kvm/Makefile b/arch/arm/kvm/Makefile index 531e59f5be9c..b76b75bd9e00 100644 --- a/arch/arm/kvm/Makefile +++ b/arch/arm/kvm/Makefile @@ -8,13 +8,14 @@ ifeq ($(plus_virt),+virt) plus_virt_def := -DREQUIRES_VIRT=1 endif +KVM := ../../../virt/kvm + ccflags-y += -I $(srctree)/$(src) -I $(srctree)/virt/kvm/arm/vgic -CFLAGS_arm.o := $(plus_virt_def) +CFLAGS_$(KVM)/arm/arm.o := $(plus_virt_def) AFLAGS_init.o := -Wa,-march=armv7-a$(plus_virt) AFLAGS_interrupts.o := -Wa,-march=armv7-a$(plus_virt) -KVM := ../../../virt/kvm kvm-arm-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o obj-$(CONFIG_KVM_ARM_HOST) += hyp/ diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 8df549138193..0f2154106d01 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -89,6 +89,7 @@ $(vobjs): KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS) $(RETPOLINE_CFLAGS # CFLAGS_REMOVE_vdso-note.o = -pg CFLAGS_REMOVE_vclock_gettime.o = -pg +CFLAGS_REMOVE_vdso32/vclock_gettime.o = -pg CFLAGS_REMOVE_vgetcpu.o = -pg CFLAGS_REMOVE_vvar.o = -pg @@ -128,7 +129,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE $(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE $(call if_changed,vdso_and_check) -CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds) +CPPFLAGS_vdso32/vdso32.lds = $(CPPFLAGS_vdso.lds) VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -soname linux-gate.so.1 targets += vdso32/vdso32.lds diff --git a/scripts/Makefile.host b/scripts/Makefile.host index b402c619147d..cd2b98e2f727 100644 --- a/scripts/Makefile.host +++ b/scripts/Makefile.host @@ -80,9 +80,9 @@ host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs)) # Handle options to gcc. Support building with separate output directory _hostc_flags = $(KBUILD_HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ - $(HOSTCFLAGS_$(basetarget).o) + $(HOSTCFLAGS_$*.o) _hostcxx_flags = $(KBUILD_HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ - $(HOSTCXXFLAGS_$(basetarget).o) + $(HOSTCXXFLAGS_$*.o) # $(objtree)/$(obj) for including generated headers from checkin source files ifeq ($(KBUILD_EXTMOD),) @@ -102,7 +102,7 @@ hostcxx_flags = -Wp,-MD,$(depfile) $(_hostcxx_flags) # host-csingle -> Executable quiet_cmd_host-csingle = HOSTCC $@ cmd_host-csingle = $(HOSTCC) $(hostc_flags) $(KBUILD_HOSTLDFLAGS) -o $@ $< \ - $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) + $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$*) $(host-csingle): $(obj)/%: $(src)/%.c FORCE $(call if_changed_dep,host-csingle) @@ -110,9 +110,9 @@ $(host-csingle): $(obj)/%: $(src)/%.c FORCE # host-cmulti -> executable quiet_cmd_host-cmulti = HOSTLD $@ cmd_host-cmulti = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ \ - $(addprefix $(obj)/,$($(@F)-objs)) \ - $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) -$(host-cmulti): FORCE + $(addprefix $(obj)/, $($*-objs)) \ + $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$*) +$(host-cmulti): $(obj)/%: FORCE $(call if_changed,host-cmulti) $(call multi_depend, $(host-cmulti), , -objs) @@ -128,9 +128,9 @@ $(host-cobjs): $(obj)/%.o: $(src)/%.c FORCE quiet_cmd_host-cxxmulti = HOSTLD $@ cmd_host-cxxmulti = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -o $@ \ $(foreach o,objs cxxobjs,\ - $(addprefix $(obj)/,$($(@F)-$(o)))) \ - $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) -$(host-cxxmulti): FORCE + $(addprefix $(obj)/, $($*-$(o)))) \ + $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$*) +$(host-cxxmulti): $(obj)/%: FORCE $(call if_changed,host-cxxmulti) $(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs) @@ -161,9 +161,9 @@ $(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE # *.o -> .so shared library (host-cshlib) quiet_cmd_host-cshlib = HOSTLLD -shared $@ cmd_host-cshlib = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \ - $(addprefix $(obj)/,$($(@F:.so=-objs))) \ - $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) -$(host-cshlib): FORCE + $(addprefix $(obj)/, $($*-objs)) \ + $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$*.so) +$(host-cshlib): $(obj)/%.so: FORCE $(call if_changed,host-cshlib) $(call multi_depend, $(host-cshlib), .so, -objs) @@ -171,9 +171,9 @@ $(call multi_depend, $(host-cshlib), .so, -objs) # *.o -> .so shared library (host-cxxshlib) quiet_cmd_host-cxxshlib = HOSTLLD -shared $@ cmd_host-cxxshlib = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \ - $(addprefix $(obj)/,$($(@F:.so=-objs))) \ - $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) -$(host-cxxshlib): FORCE + $(addprefix $(obj)/, $($*-objs)) \ + $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$*.so) +$(host-cxxshlib): $(obj)/%.so: FORCE $(call if_changed,host-cxxshlib) $(call multi_depend, $(host-cxxshlib), .so, -objs) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 264611972c4a..0d48e17bfb07 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -109,12 +109,12 @@ basename_flags = -DKBUILD_BASENAME=$(call name-fix,$(basetarget)) modname_flags = -DKBUILD_MODNAME=$(call name-fix,$(modname)) orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \ - $(ccflags-y) $(CFLAGS_$(basetarget).o) -_c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) + $(ccflags-y) $(CFLAGS_$*.o) +_c_flags = $(filter-out $(CFLAGS_REMOVE_$*.o), $(orig_c_flags)) orig_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) \ - $(asflags-y) $(AFLAGS_$(basetarget).o) -_a_flags = $(filter-out $(AFLAGS_REMOVE_$(basetarget).o), $(orig_a_flags)) -_cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F)) + $(asflags-y) $(AFLAGS_$*.o) +_a_flags = $(filter-out $(AFLAGS_REMOVE_$*.o), $(orig_a_flags)) +_cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$*.lds) # # Enable gcov profiling flags for a file, directory or for all files depending diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index bed7a5a2fbe9..ef2f2336c469 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -166,15 +166,15 @@ $(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/nconf-cfg # mconf: Used for the menuconfig target based on lxdialog hostprogs-y += mconf -lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o -mconf-objs := mconf.o $(addprefix lxdialog/, $(lxdialog)) $(common-objs) +lxdialog := $(addprefix lxdialog/, \ + checklist.o inputbox.o menubox.o textbox.o util.o yesno.o) +mconf-objs := mconf.o $(lxdialog) $(common-objs) HOSTLDLIBS_mconf = $(shell . $(obj)/mconf-cfg && echo $$libs) $(foreach f, mconf.o $(lxdialog), \ $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/mconf-cfg && echo $$$$cflags))) -$(obj)/mconf.o: $(obj)/mconf-cfg -$(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/mconf-cfg +$(addprefix $(obj)/, mconf.o $(lxdialog)): $(obj)/mconf-cfg # qconf: Used for the xconfig target based on Qt hostprogs-y += qconf From patchwork Sun Aug 25 17:28:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 172156 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3349684ily; Sun, 25 Aug 2019 10:28:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqwPFyxTeAcjcnsCCwbx4rTqjVjzuaI3Xnm8iBki31Zewcls08JIvSTUzas7J6hQ1oxcehs2 X-Received: by 2002:a17:902:d917:: with SMTP id c23mr15209943plz.248.1566754125447; Sun, 25 Aug 2019 10:28:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566754125; cv=none; d=google.com; s=arc-20160816; b=FRlSZ+owoP5oAeGZ8bEE5Ht5UI9oCI2b2hOrbkl6Q4X8DLB1q9yN2LNpYCWwYc2304 Nz0AqyLXZZUY2838ozBs3fSUx+kSa9n2ZlVNGQVBSHdWpke+qkvC62xkfF7DEznuKOOZ UpUXCjqV95vEARUMhIgVTdEuda9PXuLem+YbyeFzNka9Q1wXjQs9ZBHFB8yYYZjRY8W7 OJKh/iVVzVP9NuSbpvFT70rpPNWTWTYrxe0SPlyyob6ST9YiX/YS9p9f/l4JZ1Sn7x1e efL9M6lNEWLiXiXjvl6n8/KXhjFfMiwxqe8p18SBn4ipnMrWKiqCbwvbnZgtI8XtDWRD oz6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=R/LvQSsrWjqTLjMvhXd/xv0Gk36CKucewELa9VXReAo=; b=Oxew5pe436+5CmiR2hFEOYdkWR3NdukL0tnO27t0P4efRFmm3FA2iUbGKv5V56fpGr EoCqS7QHSPg6hEn48iGG/TIC3/54vJZVNuTk4H19jgW7k7Djw/mkMPb9dRd4m74Jy3Mf fs4XoR1nPZb6/8mH05v1v5d5ETlpoEIRZpKzlIi6EGnqla0gB1TspbPjJPXJJTl0lZtX aZcaeB6Ln0IzkLgDQcLsAqXIHhIIBbtcPJyqmfkWqhoFh+EPECl0Le3Zj+/o1E8urJty u90xQb6Vd5E2P7qC3hy4B5/GixSmmYbQ/x4C9i1Y2cSHxrYxRiFQMdJLMl2M6kq2wNdE hhSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=s8x+mnso; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bo6si12184010pjb.1.2019.08.25.10.28.45; Sun, 25 Aug 2019 10:28:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=s8x+mnso; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728737AbfHYR2n (ORCPT + 28 others); Sun, 25 Aug 2019 13:28:43 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:45503 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726981AbfHYR2n (ORCPT ); Sun, 25 Aug 2019 13:28:43 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-11.nifty.com with ESMTP id x7PHSb7P010019; Mon, 26 Aug 2019 02:28:38 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com x7PHSb7P010019 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1566754118; bh=R/LvQSsrWjqTLjMvhXd/xv0Gk36CKucewELa9VXReAo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s8x+mnso0BzwVC1knA7FsgvvOvJ2T049kyopPwWxycgrgcGJ39EFQGfdeEfMKxdc9 ssXw2BKKGPApbii7LWryNeW1jM8uFOC0vXkELK4ioGD/uSGlQTBpfWSFBnMdF5j0F+ dOiRV0TMJvYHRDt1BOStXefa8yX6NVXBm9YijMRzRl2f+GHd4kbjktF8Lmvq0lb9N8 X+KXY5K/aS2LwKE/RoFhR6SVJmfZVojVTl8HePd1Dqy4yQBRhtVn4zEw5bm0DqjgGo AhLYiqp2zM7rLGF5uKFamV8b8l8awNom5YkeJTac7Uq70PQ6tfofJLDbgbbL8sc4VH x+HIKScEL0LKw== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] kconfig: split util.c out of parser.y Date: Mon, 26 Aug 2019 02:28:33 +0900 Message-Id: <20190825172833.5708-2-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190825172833.5708-1-yamada.masahiro@socionext.com> References: <20190825172833.5708-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org util.c exists both in scripts/kconfig/ and scripts/kconfig/lxdialog. Previously, Kbuild could not pass different flags to source files with the same basename. Now that this issue was solved, you can split util.c out of parser.y and compile them independently of each other. Signed-off-by: Masahiro Yamada --- scripts/kconfig/Makefile | 2 +- scripts/kconfig/parser.y | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) -- 2.17.1 diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index ef2f2336c469..1ce83269a5dc 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -144,7 +144,7 @@ help: # =========================================================================== # object files used by all kconfig flavours common-objs := confdata.o expr.o lexer.lex.o parser.tab.o preprocess.o \ - symbol.o + symbol.o util.o $(obj)/lexer.lex.o: $(obj)/parser.tab.h HOSTCFLAGS_lexer.lex.o := -I $(srctree)/$(src) diff --git a/scripts/kconfig/parser.y b/scripts/kconfig/parser.y index 60936c76865b..b3eff9613cf8 100644 --- a/scripts/kconfig/parser.y +++ b/scripts/kconfig/parser.y @@ -727,5 +727,4 @@ void zconfdump(FILE *out) } } -#include "util.c" #include "menu.c"