From patchwork Wed Jun 15 15:45:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102203 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2640277qgf; Wed, 15 Jun 2016 08:45:53 -0700 (PDT) X-Received: by 10.107.52.133 with SMTP id b127mr203685ioa.6.1466005548654; Wed, 15 Jun 2016 08:45:48 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTP id e128si45725325pfe.226.2016.06.15.08.45.48; Wed, 15 Jun 2016 08:45:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0A36F6E983; Wed, 15 Jun 2016 15:45:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB2746E988 for ; Wed, 15 Jun 2016 15:45:36 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0LoYV0-1btgLG2Atm-00gW4k; Wed, 15 Jun 2016 17:44:28 +0200 From: Arnd Bergmann To: Michal Marek Subject: [PATCH v2 01/11] Kbuild: don't add ../../ to include path Date: Wed, 15 Jun 2016 17:45:43 +0200 Message-Id: <20160615154553.3177021-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160615154553.3177021-1-arnd@arndb.de> References: <20160615154553.3177021-1-arnd@arndb.de> X-Provags-ID: V03:K0:O3e6yf0z+bYo5LStA6V8AJ3uAwyOuZd7dLeQWyEuNPDv1dpkBq9 GQ+W7uTVSQbea8UEOVPtGqCgQaNwSpaLNNe1DOOyJe7KUVeTHHJhPvOpTm6pvLffnIkMknS 7bxiRlhjcU1mbuPYdyFTZPoZ3hDlztfLqFceS4Y3GallxL/Mp58OupgZWGnSHFzEYAznUO7 kIwb3c+y23z6uRv4V/fkA== X-UI-Out-Filterresults: notjunk:1; V01:K0:Rboai0NtkeI=:NJQdW6zxzvBFKSgBf9qWZC nYx95qJN9PuVH0MJatPGQ/DzNcJAuCxDgV9B1H/kOl6uPSMRn/3c+Pk6PWpm/Mp6JM3mBn98Y kFBc8PntAq0EO+P2om6QIWdth7LAqE9o1/sJ1uXcPA5m41aFtKCNOFa7Zo0VSFgLpoXtqpX5u 4QU0kEFKSE46yCSU62lT946HS/pFWbm5xqPY4603sp5z1vikNseAYtJYSI3sIxHRQynvZ3HZB kZekreNJZS/3dtkK7OSTKIpLb+0OEzrD3tVWUxZSYAghzFrd8/t4TUW/+bFeuGE7ArZ1Bz5sJ v6d/N1q2A9ymyceJdj2elBGUhEfWAqSa3U7OxVG5L8jpkIeBdmz3aSQ7/jYbqUUKwSOVnD86Q HYnljkYhVhJ+VLc8s7Dit1PdP2s0j4GxMzbxvbLyf+3Qv7ZewjB3Hj1DTxdDwYYQn+nQsAVVD Q2Yz1FPJZJDJ46DnUJjWqPWyODUCnYecy17R51ReZ1Or5WNzBdCG+GPUZHimY2uXZHR4BiIlJ 9YZK/uRH3JuTNlTRcSj0bkegiD57jYUY2fRcX3ZVy/fd3XNaq/b9rZ8C4nzBm2d88uqfwS8rO bnZcLwRpWJSzdNuTKbKsoBJ/DaG/Qy+4RUJ1Nily0lnz8XEpl6u0nROPHJQAAk5SrrfHKqTPi i0cadcE452J7EHlg7uQoxmiqUEtpRmUeob7rICIzvRs1iwiXGfi00Ak17SE0sH8InRQQ= Cc: Arnd Bergmann , linux-kbuild@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" When we build with O=objdir and objdir is directly below the source tree, $(srctree) becomes '..'. When a Makefile adds a CFLAGS option like -Ipath/to/headers and we are building with a separate object directory, Kbuild tries to add two -I options, one for the source tree and one for the object tree. An absolute path is treated as a special case, and don't add this one twice. This also normally catches -I$(srctree)/$(src) as $(srctree) usually is an absolute directory like /home/arnd/linux/. The combination of the two behaviors however results in an invalid path name to be included: we get both ../$(src) and ../../$(src), the latter one pointing outside of the source tree, usually to a nonexisting directory. Building with 'make W=1' makes this obvious: cc1: error: ../../arch/arm/mach-s3c24xx/include: No such file or directory [-Werror=missing-include-dirs] This adds another special case, treating path names starting with ../ like those starting with / so we don't try to prefix that with $(srctree). Signed-off-by: Arnd Bergmann --- scripts/Kbuild.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 0f82314621f2..f8b45eb47ed3 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -202,7 +202,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj # Prefix -I with $(srctree) if it is not an absolute path. # skip if -I has no parameter addtree = $(if $(patsubst -I%,%,$(1)), \ -$(if $(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1)) +$(if $(filter-out -I/% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1)) # Find all -I options and call addtree flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o))) From patchwork Wed Jun 15 15:45:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102212 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2639740qgf; Wed, 15 Jun 2016 08:44:45 -0700 (PDT) X-Received: by 10.66.47.196 with SMTP id f4mr4437649pan.126.1466005485548; Wed, 15 Jun 2016 08:44:45 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTP id r5si15699551pfr.51.2016.06.15.08.44.45; Wed, 15 Jun 2016 08:44:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D47376E141; Wed, 15 Jun 2016 15:44:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3527E6E982 for ; Wed, 15 Jun 2016 15:44:36 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0LeLdN-1bl7VB3QE9-00qAan; Wed, 15 Jun 2016 17:44:28 +0200 From: Arnd Bergmann To: Michal Marek Subject: [PATCH v2 02/11] Kbuild: avoid duplicate include path Date: Wed, 15 Jun 2016 17:45:44 +0200 Message-Id: <20160615154553.3177021-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160615154553.3177021-1-arnd@arndb.de> References: <20160615154553.3177021-1-arnd@arndb.de> X-Provags-ID: V03:K0:jjraJj0S7QdszFFdBChy1dyUkbZLBprBDfg3ZU2gu0MIkdZSW1W 1UP7FnVxGHvF4eZKlII5/kTmgmxjal7UIC0WceSeXmgKSxW6oyHlFBdtN5YTTEY9x3KFbx5 Wnl8bL/TrdIF9r3AEY44i/ielUJ0ytz5NlgUw5+PNmSw84Lo8uUnLMCOvM+X5U1bpoQ8+G7 a0GGCikL42ZRdv5Ly2J2g== X-UI-Out-Filterresults: notjunk:1; V01:K0:+beE1URiims=:1eeGbEvEVXUiSQfNyDVYOn KLYZajitQbPq+Y5g2WiC/M6JTsglNPQkuTIW/OXqLAK08DfL+lSOUUpJetHsmh1IPVoIzVKi1 2iK7KcQg07jWi4+BCln/GdemXU1ykSvwJ+Y9k1cgsrKipSwe0qD9xgK37OUIi6YeRK9Hql1XW W/YVDSUpy8JngGFepbYp8sjQsUkadWHa/q8KkJ7DhuZANa8GqWpPD9eGV+4PkvQH8A6a0TU89 q13o20chAb2MCo4lbIrNadxw/wnZpKjjMIFyDI7hr06/3V1ZDdkuEV/PYvBK0yZk1b746qlrB m+0aO8GjSX7LZb+mtv2sJGmNbpupUS/PrlsVVcXnQAHEyKMtNe1y++6tA4PPz0UN7f/2Se4s9 ywcJcv9erAF2mGsUI6hBCVYrekK/Ge2UaUfLydcHVBU1nr5e5GWF4d8/mzfOlU6ueapAVrfzP wsKxvfX3g7fciZvl3+SqCnyN3EpbuC7ZlOK756T3piLlROvOrTGwALXQBgjKzDDHD1qg8I+yL bYLNwRkIKCJewPI+gmBHdfUs5i3dTUNGgjDtDtXtSRKhMZ898HySwGAibz+6D3QU7KXz27DAW bi1heh0NA38PBTdO0UQlSRIF8E1zrMOn7nWalfuHFSSP0NeciZEOKu8V/HMMLAdTKJYsT5TjK 1XUYhc4DYDZBtU0NJqmZyb1ctikjqtSPyJI+sYHCgvuE6BCeBXfu2ZH0cnLRJQMr6fbU= Cc: Arnd Bergmann , linux-kbuild@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" arch/$(hdr-arch)/include/generated/uapi is included twice in the header search path, which is unnecessary, so this changes the top-level Makefile to drop the second instance by filtering out everything from USERINCLUDE that was already part of LINUXINCLUDE. This should have very little effect other than making the 'make V=1' output slightly smaller and making the build time faster by a miniscule amount, but it seems to be cleaner. Signed-off-by: Arnd Bergmann --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8b80a1506be0..45159861e645 100644 --- a/Makefile +++ b/Makefile @@ -389,8 +389,9 @@ LINUXINCLUDE := \ -Iarch/$(hdr-arch)/include/generated/uapi \ -Iarch/$(hdr-arch)/include/generated \ $(if $(KBUILD_SRC), -I$(srctree)/include) \ - -Iinclude \ - $(USERINCLUDE) + -Iinclude + +LINUXINCLUDE += $(filter-out $(LINUXINCLUDE),$(USERINCLUDE)) KBUILD_CPPFLAGS := -D__KERNEL__ From patchwork Wed Jun 15 15:45:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102209 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2639929qgf; Wed, 15 Jun 2016 08:45:12 -0700 (PDT) X-Received: by 10.66.183.168 with SMTP id en8mr4480929pac.64.1466005509683; Wed, 15 Jun 2016 08:45:09 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id r8si28382400pfi.182.2016.06.15.08.45.09; Wed, 15 Jun 2016 08:45:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C5106E984; Wed, 15 Jun 2016 15:45:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id 75A2C6E984 for ; Wed, 15 Jun 2016 15:44:39 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0MPXsH-1bHJaW0Xpp-004hHp; Wed, 15 Jun 2016 17:44:29 +0200 From: Arnd Bergmann To: Michal Marek Subject: [PATCH v2 03/11] Kbuild: always prefix objtree in LINUXINCLUDE Date: Wed, 15 Jun 2016 17:45:45 +0200 Message-Id: <20160615154553.3177021-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160615154553.3177021-1-arnd@arndb.de> References: <20160615154553.3177021-1-arnd@arndb.de> X-Provags-ID: V03:K0:7usIlEr7pJiacm2ekoR+rOnx89poteDnj280FlANYCkH1EZRPgE 08TYtImb7uu/IavecO6mo6Tgn2EhtLtB9oZH2Iq6nZ5wpdVFKmnysdet4+P0BO4hgi6uwnC zja9WpCphN+mxC4OoE7VN68PmBYJX5p55wBzVuVEPDe679EgQ22cFtR5Rcb2ALznmWln00A fRaDTMHNbfhQILfcgBa+A== X-UI-Out-Filterresults: notjunk:1; V01:K0:PaGMwOI9U7w=:vto+ogNe9H2nYkwatHrU7m yIH0lrtJUr8vFEgPAnped801fBxXYuec/19lD0h73tf5y71HiswKKn0QVu8Sq0yyII6aaFMxT hH0tGiCm60rxQOS8PoECBYInCz9HIYwgdG+ZojDsQNt0T2d/j42TMriFE4SJIPlVzV+CEGgDQ lDP+cvMS7r8to0QfJa+GUpOJRFeJ1p3oscYERsTZZgtvnzDoWQHzfJlMiA4bLKdHEA10N/XKR dRc2CJ+jZZmdzgOJa21s4Vngo95FYW3+JdozZz46p2f/sw9u2Sdg+vXXE1+ey5nfO3xynmUPj Z3yTt8Uxp7aFxNtT2BsaPaYx047JDeJf6hW48Ls1Yqekeo7ZvtMxYZxvA5geAxcgB0R3A7QlW Wry+od4WxzF60E/9GCK/qh8iTPe8wjq7xMyPv7RlByO5WC2Fhi9Nv8cxA5urCrsmrPzUDtP8W BFnuehM7lE04EGYdzURi82osD6tXCQUAwy5I3OB30EhIJPuz0OM7oCWAQKW9if6FB61XXUwMJ 6WXgPhdAx0qbmLWX1JVXaz5gGdMhjK6zld+8KLaNJBCT+DEaVPwYGwhPLl8SmU45nNEydlBO8 ZZ1FnjjNLXi9FisIHgyMiAMp8Le8G2Tn47UuPrm7v8r9ElyERumFKeXmmawdssbeS8ZWVdRN3 wXRtNOq4dzWEqvfQk9dvr1QNDZeZwOjEINJReqYlAFJYwhzyxh/dvwqY+pWhWYjp7VY0= Cc: Arnd Bergmann , linux-kbuild@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" When $(LINUXINCLUDE) is added to the cflags of a target that normall doesn't have it (e.g. HOSTCFLAGS), each entry in the list is expanded so that we search both $(objtree) and $(srctree), which is a bit silly, as we already know which of the two we want for each entry in LINUXINCLUDE. Also, a follow-up patch changes the behavior so we only look in $(srctree) for manually added include path, and that breaks finding the generated headers. This adds an explicit $(objtree) for each tree that we want to look for generated files. Signed-off-by: Arnd Bergmann --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 45159861e645..969924783543 100644 --- a/Makefile +++ b/Makefile @@ -377,19 +377,19 @@ CFLAGS_KCOV := $(call cc-option,-fsanitize-coverage=trace-pc,) # Use USERINCLUDE when you must reference the UAPI directories only. USERINCLUDE := \ -I$(srctree)/arch/$(hdr-arch)/include/uapi \ - -Iarch/$(hdr-arch)/include/generated/uapi \ + -I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \ -I$(srctree)/include/uapi \ - -Iinclude/generated/uapi \ + -I$(objtree)/include/generated/uapi \ -include $(srctree)/include/linux/kconfig.h # Use LINUXINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option LINUXINCLUDE := \ -I$(srctree)/arch/$(hdr-arch)/include \ - -Iarch/$(hdr-arch)/include/generated/uapi \ - -Iarch/$(hdr-arch)/include/generated \ + -I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \ + -I$(objtree)/arch/$(hdr-arch)/include/generated \ $(if $(KBUILD_SRC), -I$(srctree)/include) \ - -Iinclude + -I$(objtree)/include LINUXINCLUDE += $(filter-out $(LINUXINCLUDE),$(USERINCLUDE)) From patchwork Wed Jun 15 15:45:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102206 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2640215qgf; Wed, 15 Jun 2016 08:45:45 -0700 (PDT) X-Received: by 10.36.26.70 with SMTP id 67mr195472iti.4.1466005544686; Wed, 15 Jun 2016 08:45:44 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id s127si45757677pfb.79.2016.06.15.08.45.44; Wed, 15 Jun 2016 08:45:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7889E6E988; Wed, 15 Jun 2016 15:45:41 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id BF5E46E987 for ; Wed, 15 Jun 2016 15:45:36 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0M7bqp-1bacp81l8p-00xLZb; Wed, 15 Jun 2016 17:44:29 +0200 From: Arnd Bergmann To: Michal Marek Subject: [PATCH v2 04/11] Kbuild: arch: look for generated headers in obtree Date: Wed, 15 Jun 2016 17:45:46 +0200 Message-Id: <20160615154553.3177021-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160615154553.3177021-1-arnd@arndb.de> References: <20160615154553.3177021-1-arnd@arndb.de> X-Provags-ID: V03:K0:Snj7LYxE4GDPccFAAMmIT+ZecBoKzrxpZX+Av5+MzHfc666mg8a +XFeYrXIIfzntpWI2ch8zjIbDb8Gfv/7th6AUNlirb/1ItK3xJthuSszTzZhvTjKPVZM9nx vq54gwtMbBP0JsY8naljUbMLaYfCdJDV0kkMQT+B+dj8fQBCRCopTjundi/X36lg2dFbxv2 QW7XjmudjakfcUs/PDccQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:H8ph5/VISXw=:cY1SF0aP4v4vN1K7TAZ3FS DTszfbwvN7rQ2Znyl7HGpe5kulVfe67AMn37rfPqoRoJwyQb1Fxu/jL0bNu5lWSCROQYjafJo DGRsADNt+jvpugL2oB/Z7auHjt/d5EzE34Xr22zjl4Ed/ibqkEWPyM9XLFSyAYEZ0nds8sbfA WAiJOMtLX4LIHXjmhWW8u0LuzhZykfmtOQLPP2WtnuYIe/WSxiycIgCRc9zJraGDj0jSqBkjA j3Fc0TXeWpJhX1D9l0WftH0BDhRq+cNGxl8qwKgahvLhMAnu/G/hCgPQDaNBo+ZRhrKfzysZm 5pGRdXtfg6gQuoU1Izqcgs5LxnIJ28gfJno5hN5tiWGac85bJoOipyGXWptKNItPY1eKfdVu6 0UPwAw4a4Upqe9OpfJ/vdcj+ivkVGrTSwIaQjpmtMtG7xd91tOACjFXEBkF26Ro/hBr/Y9X1M OAA64k68KN0LWvGL/IGNDj1MEhNroo2apwN2cLIRh7aBnPIwHMMUHfDmOGnHQYcrMHNMWiKOZ 8tzByJEVK9+yzuco9GH5KNC7KboyP44VLyqNW+eck6bPkAfv6c5g1CnmYhWtKjwHDKQ3qulnc qH1YX/D8rdHj6kXg9rJV9Sr/crQcfCY48oG5DNetbH8ab2nJG7vXl6sjW/MLlR+QwVYFx2snY AWIvFixR2erLlB4iQHAKIrRgepi6/WLdmxI3rkXzZiEq0wdn3ZZrEp+OevBlba1FPnz8= Cc: Arnd Bergmann , linux-kbuild@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" There are very few files that need add an -I$(obj) gcc for the preprocessor or the assembler. For C files, we add always these for both the objtree and srctree, but for the other ones we require the Makefile to add them, and Kbuild then adds it for both trees. As a preparation for changing the meaning of the -I$(obj) directive to only refer to the srctree, this changes the two instances in arch/x86 to use an explictit $(objtree) prefix where needed, otherwise we won't find the headers any more, as reported by the kbuild 0day builder. arch/x86/realmode/rm/realmode.lds.S:75:20: fatal error: pasyms.h: No such file or directory Signed-off-by: Arnd Bergmann --- arch/alpha/boot/Makefile | 2 +- arch/powerpc/boot/Makefile | 2 +- arch/powerpc/kvm/Makefile | 2 +- arch/s390/boot/compressed/Makefile | 4 ++-- arch/um/Makefile | 4 ++-- arch/x86/boot/Makefile | 2 +- arch/x86/realmode/rm/Makefile | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/alpha/boot/Makefile b/arch/alpha/boot/Makefile index 8399bd0e68e8..0cbe4c59d3ce 100644 --- a/arch/alpha/boot/Makefile +++ b/arch/alpha/boot/Makefile @@ -15,7 +15,7 @@ targets := vmlinux.gz vmlinux \ OBJSTRIP := $(obj)/tools/objstrip HOSTCFLAGS := -Wall -I$(objtree)/usr/include -BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj) +BOOTCFLAGS += -I$(objtree)/$(obj) -I$(srctree)/$(obj) # SRM bootable image. Copy to offset 512 of a partition. $(obj)/bootimage: $(addprefix $(obj)/tools/,mkbb lxboot bootlx) $(obj)/vmlinux.nh diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 8fe78a3efc92..ad3782610cf1 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -43,7 +43,7 @@ ifeq ($(call cc-option-yn, -fstack-protector),y) BOOTCFLAGS += -fno-stack-protector endif -BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj) +BOOTCFLAGS += -I$(objtree)/$(obj) -I$(srctree)/$(obj) DTC_FLAGS ?= -p 1024 diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index eba0bea6e032..1f9e5529e692 100644 --- a/arch/powerpc/kvm/Makefile +++ b/arch/powerpc/kvm/Makefile @@ -20,7 +20,7 @@ common-objs-y += powerpc.o emulate.o emulate_loadstore.o obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o obj-$(CONFIG_KVM_BOOK3S_HANDLER) += book3s_exports.o -AFLAGS_booke_interrupts.o := -I$(obj) +AFLAGS_booke_interrupts.o := -I$(objtree)/$(obj) kvm-e500-objs := \ $(common-objs-y) \ diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile index 1dd210347e12..2657a29a2026 100644 --- a/arch/s390/boot/compressed/Makefile +++ b/arch/s390/boot/compressed/Makefile @@ -31,10 +31,10 @@ quiet_cmd_sizes = GEN $@ $(obj)/sizes.h: vmlinux $(call if_changed,sizes) -AFLAGS_head.o += -I$(obj) +AFLAGS_head.o += -I$(objtree)/$(obj) $(obj)/head.o: $(obj)/sizes.h -CFLAGS_misc.o += -I$(obj) +CFLAGS_misc.o += -I$(objtree)/$(obj) $(obj)/misc.o: $(obj)/sizes.h OBJCOPYFLAGS_vmlinux.bin := -R .comment -S diff --git a/arch/um/Makefile b/arch/um/Makefile index e3abe6f3156d..0ca46ededfc7 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -78,8 +78,8 @@ include $(ARCH_DIR)/Makefile-os-$(OS) KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \ -I$(srctree)/$(HOST_DIR)/include/uapi \ - -I$(HOST_DIR)/include/generated \ - -I$(HOST_DIR)/include/generated/uapi + -I$(objtree)/$(HOST_DIR)/include/generated \ + -I$(objtree)/$(HOST_DIR)/include/generated/uapi # -Derrno=kernel_errno - This turns all kernel references to errno into # kernel_errno to separate them from the libc errno. This allows -fno-common diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index be8e688fa0d4..12ea8f8384f4 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -96,7 +96,7 @@ $(obj)/zoffset.h: $(obj)/compressed/vmlinux FORCE $(call if_changed,zoffset) -AFLAGS_header.o += -I$(obj) +AFLAGS_header.o += -I$(objtree)/$(obj) $(obj)/header.o: $(obj)/zoffset.h LDFLAGS_setup.elf := -T diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile index c556c5ae8de5..25012abc3409 100644 --- a/arch/x86/realmode/rm/Makefile +++ b/arch/x86/realmode/rm/Makefile @@ -48,7 +48,7 @@ targets += realmode.lds $(obj)/realmode.lds: $(obj)/pasyms.h LDFLAGS_realmode.elf := --emit-relocs -T -CPPFLAGS_realmode.lds += -P -C -I$(obj) +CPPFLAGS_realmode.lds += -P -C -I$(objtree)/$(obj) targets += realmode.elf $(obj)/realmode.elf: $(obj)/realmode.lds $(REALMODE_OBJS) FORCE From patchwork Wed Jun 15 15:45:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102210 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2639908qgf; Wed, 15 Jun 2016 08:45:09 -0700 (PDT) X-Received: by 10.36.31.213 with SMTP id d204mr137568itd.74.1466005508177; Wed, 15 Jun 2016 08:45:08 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id h80si14999098pfj.46.2016.06.15.08.45.07; Wed, 15 Jun 2016 08:45:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D863C6E985; Wed, 15 Jun 2016 15:45:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4882D6E983 for ; Wed, 15 Jun 2016 15:44:39 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0McnPF-1avGSy32Hp-00HwoH; Wed, 15 Jun 2016 17:44:29 +0200 From: Arnd Bergmann To: Michal Marek Subject: [PATCH v2 05/11] Kbuild: don't add obj tree in additional includes Date: Wed, 15 Jun 2016 17:45:47 +0200 Message-Id: <20160615154553.3177021-6-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160615154553.3177021-1-arnd@arndb.de> References: <20160615154553.3177021-1-arnd@arndb.de> X-Provags-ID: V03:K0:J37js9QvM7JrfnyhtoBgKH4p1UwMtvKqKHrsGCPBuepPF2oMdOv eG7ozGNbiuxzh1Yo9jr0Tkot9Vu3DrG2BSNvzdbbuYCWQRp7mTDix0B6b58litheygpb7cz 8d8fw18Y2q98XsDixz0WVjzbdWhCqfnFsqOCqJfx4CSv18nxfa0pHpC/iV5KN9JLLuNOHfm P8urvUV2g3J6giaLACSqQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:pLlTV+q1ny8=:ZPYog6hZEN8d8eo0a9Yybp YEWhMYqBUek6bfkntLUaG1jHwht4Pu5VpxicxqUhRUGbxgI/3oPsFsy6gt+Yik6VxevV4ygTI AwGq8bTLDtw8pC+AutNmL+LGgyeb8K9BhaTIm6RCNnfV9uyjBfzVmST//rhtl0ogGFE1rfteU JpTvqrI0xnazZOJOMgBV5Vtc7EDO8qIZ2znj6HATdJo/Ugd251mZK7SrJMck6dXXh/dcj54u4 e07rMrBoPeV207NlAzalAuTav/0zYF0kmuqeBIja64y6dtElZ7wAqDgBx5qkPHF8y5hj7uzvx YFGF3t3vBOHtkhweM7qaf8ZWIOjdKwMWKCj/qDfr6JUU+dkTXDLXyU3rrK8CftTashMMZgUjo ZLdnG7Y3NlIG7mc7FqoxsBoI0RuSD2WAARY0oDaKjOmNXYIWlcGIGGKHp0nZqAiFk2qDs1qP+ /JxqJH5G2Bpq1Sz2QkU28zOLWTyhPNygc8kByaS5xjfB4FXZuw+ZD829vJE0+TRGfwU7ekoSl z1YJdveDkVzlC7KKBc8j44/bIkJyxwrl3OUjBo/zL5mVfEy7GqkeM0dPSu6JsHnwqYiP4a2fK +aCDmj6VayO67t5xNtOOgd11ebTHLfNgf/kVLNM62HRBDc1mG/w31rvyhlhIVdMt7PBN7JKr3 4txCLbaoKPsCI0F1bu/SflZMnTt8iJwJP0wO+57lMwvbeSM+INOIUMKnzMiEume5SjB0= Cc: Arnd Bergmann , linux-kbuild@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" When building with separate object directories and driver specific Makefiles that add additional header include paths, Kbuild adjusts the gcc flags so that we include both the directory in the source tree and in the object tree. However, due to another bug I fixed earlier, this did not actually include the correct directory in the object tree, so we know that we only really need the source tree here. Also, including the object tree sometimes causes warnings about nonexisting directories when the include path only exists in the source. This changes the logic to only emit the -I argument for the srctree, not for objects. We still need both $(srctree)/$(src) and $(obj) though, so I'm adding them manually. Signed-off-by: Arnd Bergmann --- scripts/Kbuild.include | 2 +- scripts/Makefile.lib | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index f8b45eb47ed3..15b196fc2f49 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -202,7 +202,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj # Prefix -I with $(srctree) if it is not an absolute path. # skip if -I has no parameter addtree = $(if $(patsubst -I%,%,$(1)), \ -$(if $(filter-out -I/% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1)) +$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1))) # Find all -I options and call addtree flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o))) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 76494e15417b..0a07f9014944 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -155,9 +155,10 @@ else # $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files # and locates generated .h files # FIXME: Replace both with specific CFLAGS* statements in the makefiles -__c_flags = $(call addtree,-I$(obj)) $(call flags,_c_flags) -__a_flags = $(call flags,_a_flags) -__cpp_flags = $(call flags,_cpp_flags) +__c_flags = $(if $(obj),-I$(srctree)/$(src) -I$(obj)) \ + $(call flags,_c_flags) +__a_flags = $(call flags,_a_flags) +__cpp_flags = $(call flags,_cpp_flags) endif c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ From patchwork Wed Jun 15 15:45:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102205 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2640233qgf; Wed, 15 Jun 2016 08:45:47 -0700 (PDT) X-Received: by 10.98.90.67 with SMTP id o64mr4481779pfb.150.1466005547053; Wed, 15 Jun 2016 08:45:47 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTP id dc7si2680657pab.147.2016.06.15.08.45.46; Wed, 15 Jun 2016 08:45:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E132A6E98B; Wed, 15 Jun 2016 15:45:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by gabe.freedesktop.org (Postfix) with ESMTPS id D9C916E983 for ; Wed, 15 Jun 2016 15:44:37 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0MXYso-1asjV2049u-00WZPW; Wed, 15 Jun 2016 17:44:30 +0200 From: Arnd Bergmann To: Michal Marek Subject: [PATCH v2 06/11] ARM: don't include removed directories Date: Wed, 15 Jun 2016 17:45:48 +0200 Message-Id: <20160615154553.3177021-7-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160615154553.3177021-1-arnd@arndb.de> References: <20160615154553.3177021-1-arnd@arndb.de> X-Provags-ID: V03:K0:Mj8O3LntMENl3A12/FVldbt6BzDA6WXfrUx2dhxRzNF8Isedyy+ 6ZFr3SqEt5bjkYG3qRO36oN2obalr2p2hVSgMjmoSSXsHGXysFhpWFeUUdlcOYn0uF50R4z TYeRdNFMgmtUfvmLHY9Yv9aLYcdframSjyok+MOsbP0oynURqgCQWlXj3H1drD7tLIPLPvy Ceo8pcHhCE3A34nz525pQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:AX5xfv+aIMQ=:lO8Z/Qa9QmUnc5iLgKFUwU HBnyF0dwrP3CJXOp53xtMHZ2YBBivKb5kLOXd27zaUoDn1bxXR+x1woP4Hmlb2ehhEeiF5psA chtA9tBIVqftkvPP/IvUUKlXVHFPp49TrgG45ce+40CysLTx/hl2G+4iMZlCU9K9zpXIWW6xR 0Jfz5CslQSHUulmu1YSAL8awadoWeJqDqHkmxFD+wyuvmPppj1tTdsq8Vvs8eGSU7rPmW7mh7 XTxgwlfGFe/q9HHIsC2u0WUDJ16KRa0xgQrSR3vGoqRnED/A0hdo581ye96o1LFinwh5mTukt isYLs0OGmEgt8JDiwPrq/dgoLjhdqyP/Jh0Sd0xpy1ONpvu8pvwnnqXAR018rBeIUtExWQTzj HKS42X5Ts7Anwcy3+aBvqBE6Tajg0MGX5cA8MKINeaNDYgBQnAVqNQQkxyAauJHaWbUq1s0am qZKrYcoKn74xtsRRI0JFkCW6QBe6HoyL+gxcnrBBiB2jjd9WdPz9uXUN99NvpKRD55Lk1/qa5 OeqmVyZqPaXfe42DAaChEqO+ZPsWYIxVpvI7haDQsUsHqKmvt/0lh38y2u1FvvSlNS9Ky5hhY GNQkFDhgjV5Ar5NdX6Z0zkegElFAUpjki0pTuspyXL+qhGfGcHGuh64EJTcA4Q+YWuzoAANd7 zSnUYyTvE1O3X/fVbGfmmUni9c/o/IeibNKVB84TEjATF2Ui45LRMAuSaoOKEVR+AmJE= Cc: Arnd Bergmann , linux-kbuild@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Three platforms used to have header files in include/mach that are now all gone, but the removed directories are still being included, which leads to -Wmissing-include-dirs warnings. This removes the extra -I flags. Signed-off-by: Arnd Bergmann --- arch/arm/mach-mvebu/Makefile | 3 +-- arch/arm/mach-realview/Makefile | 3 +-- arch/arm/mach-s5pv210/Makefile | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index ecf9e0c3b107..568863e1513c 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -1,5 +1,4 @@ -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ - -I$(srctree)/arch/arm/plat-orion/include +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include AFLAGS_coherency_ll.o := -Wa,-march=armv7-a CFLAGS_pmsu.o := -march=armv7-a diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile index dae8d86ef4cc..404882130956 100644 --- a/arch/arm/mach-realview/Makefile +++ b/arch/arm/mach-realview/Makefile @@ -1,8 +1,7 @@ # # Makefile for the linux kernel. # -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ - -I$(srctree)/arch/arm/plat-versatile/include +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-versatile/include obj-y := core.o obj-$(CONFIG_REALVIEW_DT) += realview-dt.o diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile index 72b9e9671507..fa7fb716e388 100644 --- a/arch/arm/mach-s5pv210/Makefile +++ b/arch/arm/mach-s5pv210/Makefile @@ -5,7 +5,7 @@ # # Licensed under GPLv2 -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/arch/arm/plat-samsung/include # Core From patchwork Wed Jun 15 15:45:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102211 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2639872qgf; Wed, 15 Jun 2016 08:45:05 -0700 (PDT) X-Received: by 10.98.8.91 with SMTP id c88mr4480659pfd.57.1466005505799; Wed, 15 Jun 2016 08:45:05 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTP id i23si45736558pfa.147.2016.06.15.08.45.05; Wed, 15 Jun 2016 08:45:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BBC5D6E13C; Wed, 15 Jun 2016 15:45:03 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8FCBC6E986 for ; Wed, 15 Jun 2016 15:44:39 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0LoHFZ-1bsrGJ1IxF-00gExZ; Wed, 15 Jun 2016 17:44:30 +0200 From: Arnd Bergmann To: Michal Marek Subject: [PATCH v2 07/11] ARM: hide mach-*/ include for ARM_SINGLE_ARMV7M Date: Wed, 15 Jun 2016 17:45:49 +0200 Message-Id: <20160615154553.3177021-8-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160615154553.3177021-1-arnd@arndb.de> References: <20160615154553.3177021-1-arnd@arndb.de> X-Provags-ID: V03:K0:OFT6Z/8VNCqrFQ4+WazcOXMXloQj+ngYWIk3ofzc8D0GeKbUCNK SiLn0igDaq5Ibazl5HTKMKt5JVTiTSxSPjTyhTP+ci/BEeoHIrwThnAWsaHDkVyR1VI24fq ZFEwPOYsKEun3HcgBPrKgCZUJHZ8UGBxd2HmwLFUvyJ+eT5n0xRpq9ytD7oib4ocGjBxw4L mw4IJRdp8wUIZZ2Pf+4wg== X-UI-Out-Filterresults: notjunk:1; V01:K0:xbQNv/DSguU=:drzpibdz5A6UogspQNKWwj 5nvxgxPsS7FCoLcFCq4KFRtvA2borjeESBVkyWeqbDM+/dskYeI4MQbG4s2TRnBPhfIObe8dT LIy6LokJ6/UkIlZ5hIYR95WxblKSAGaznYTvUdOc+wLkXYmR4J+9DjOv6mrliBVEIBTKC+PCu SeJdCYnGjiZFYHkRnwkCvOKIxMh2oN+sq8XgdxNYNwciihmwlVE72PPnqRSp2YXM3mm+UjvkG MZIS1kaLAli/py52tCgBbi1Mtcazne+dNPq/Ba4ERaekpIhZ3bnhpiFEKM0tZgj8OcSQ0B+kM wLNxDkZA1XEUO4fvOUPX5WcZ5yHdudz4j8uAEXggzhTwQi1XaAiVonv2/FSMCvRMkOm/J6ZTQ vn2P+24XuuR2PkHwH681nKa0R6cJWUKYFoQ4Hit0qlDAKjjhoI5u4Mkv1PMNttnPGe4mz50o9 Q344GmMhWWcHfHnXn/rcFqM2EADEd+5AXqwHsf52pS7hRv9bo1oGm5H3NVQ4H5BWZJkCV/wUK iQ0lbu9v+iKADiIEKRGdSVdbIg6kfQENiSCAhIYLfU1c7r6K8zGeMDyX7wsPDSQCFd3XZV9t8 AgzeokQPCc51bPM8SarkOkatNSSrMV5xvVHapfBiHahGedIAhuXhyP4XGA6+WPXVSVx42rlF4 bqOQ6BlS+u1Nl1Rrag4c4EE6SXuhV0DxyPk1t3g7fnwf483rwu6nmCL/Td4JE7W4a2+k= Cc: Arnd Bergmann , linux-kbuild@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The machine specific header files are exported for traditional platforms, but not for the ones that use ARCH_MULTIPLATFORM, as they could conflict with one another. In case of ARM_SINGLE_ARMV7M, we end up also exporting them, but that appears to be a mistake, and we should treat it the same way as ARCH_MULTIPLATFORM here. 'make W=1' warns about this because it passes -Wmissing-includes to gcc and the directories are not actually present. Signed-off-by: Arnd Bergmann --- arch/arm/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 510620186ee8..3982c7e2fe55 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -266,12 +266,14 @@ machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y))) ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y) +ifneq ($(CONFIG_ARM_SINGLE_ARMV7M),y) ifeq ($(KBUILD_SRC),) KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs)) else KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs)) endif endif +endif export TEXT_OFFSET GZFLAGS MMUEXT From patchwork Wed Jun 15 15:45:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102213 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2639713qgf; Wed, 15 Jun 2016 08:44:42 -0700 (PDT) X-Received: by 10.107.180.14 with SMTP id d14mr36064iof.151.1466005482682; Wed, 15 Jun 2016 08:44:42 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id xi11si10155534pac.134.2016.06.15.08.44.42; Wed, 15 Jun 2016 08:44:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4533D6E982; Wed, 15 Jun 2016 15:44:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 350206E141 for ; Wed, 15 Jun 2016 15:44:36 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0MF3Up-1bBEmr2fyV-00GI91; Wed, 15 Jun 2016 17:44:30 +0200 From: Arnd Bergmann To: Michal Marek Subject: [PATCH v2 08/11] drm: amd: remove broken include path Date: Wed, 15 Jun 2016 17:45:50 +0200 Message-Id: <20160615154553.3177021-9-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160615154553.3177021-1-arnd@arndb.de> References: <20160615154553.3177021-1-arnd@arndb.de> X-Provags-ID: V03:K0:3Th7YIN6GIcaykgX55CeDx7hA99myJGfwfmpaOk4fOuBPRuZlGS aHWhq3Cwkk961m1YLJ0S/41EK31VXqemvpVRofXxr/uJDkgYfg/H32IcDFGteIfszQYu/DI CuinEO1RpW5dQaBMHDlN7K/cSg4pp7902gzAyLrHnRuvu/TrMG9mCdLVIdFTronhh1wClMx ULlJGAVY5fIcwTHV8VIQg== X-UI-Out-Filterresults: notjunk:1; V01:K0:4GJcfuPKjx8=:2AJSYDRlOojcvYOM9EUPMn dJgJ0GsVpbuINrZ9DHia69x3Bdx5FjUrsFWCVId6vKr31/uwWVoPZX1ae+BDThkXLilF3cssE NQz4WmOG8OVG2ZlKpiTNhOU8ScHEa0kNJjLUs6g29dzfD5HT2zxVVG8wbSjYFuENHsfHsGtL2 Sznd45fVj+UskbaLnLM9HaTQMXjp7exBJdNQF87ANAy7B9ACZ6fE79aSqiNzoLcMnBaqTKuxC 5GWp2rsjmN3DOWsZWsLCX8CHGhyBRZJ/xPf9lhGJssYoHR/TYH1CGemh+2QrFuNIIxLo0EkxU mXEDAyQNS/CzeYLqF380hAA0yaaUZP5vuVe2vX4QvHIsf+s0dqYzRbzzL7c5OXFiTOFGpBZzz AQDjqf5IK/EOtT27Pp+evBR9HIykh08B9whNlTvD5TpMY5VivsI/zjc8SN3bX9ZxYY1Gx5Mp8 2gl4OnPaTDoNASGeh8PWNHrk73HTSkaUiOkwuTBrJtxiqnTn3CKEkavR25K28EOFCVclkgQqB 7+CRuEhj0uUMtY5YVQIVSmsJBrCwWl53KjLO6Gf6lssdOtW4v+/FhWMGAlar5nKsEOs4LESRJ uOIoy3jSFQRPUbTLbrzSAJEl6jWxfRMeVoHGed4s6rLeVE1w+pk5PankNzDEih+AhnTMhkfI3 SJmZHrLnCfl8GYj0rd4W4MsQTV6Cm8HOXwia6YZOJzzDL0dxTRMmonmlOc72tTPt5VOQ= Cc: Arnd Bergmann , linux-kbuild@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The AMD ACP driver adds "-I../acp -I../acp/include" to the gcc command line, which makes no sense, since these are evaluated relative to the build directory. When we build with "make W=1", they instead cause a warning: cc1: error: ../acp/: No such file or directory [-Werror=missing-include-dirs] cc1: error: ../acp/include: No such file or directory [-Werror=missing-include-dirs] cc1: all warnings being treated as errors ../scripts/Makefile.build:289: recipe for target 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.o' failed ../scripts/Makefile.build:289: recipe for target 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.o' failed ../scripts/Makefile.build:289: recipe for target 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.o' failed This removes the subdir-ccflags variable that evidently did not serve any purpose here. Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/acp/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/amd/acp/Makefile b/drivers/gpu/drm/amd/acp/Makefile index 8363cb57915b..8a08e81ee90d 100644 --- a/drivers/gpu/drm/amd/acp/Makefile +++ b/drivers/gpu/drm/amd/acp/Makefile @@ -3,6 +3,4 @@ # of AMDSOC/AMDGPU drm driver. # It provides the HW control for ACP related functionalities. -subdir-ccflags-y += -I$(AMDACPPATH)/ -I$(AMDACPPATH)/include - AMD_ACP_FILES := $(AMDACPPATH)/acp_hw.o From patchwork Wed Jun 15 15:45:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102204 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2640253qgf; Wed, 15 Jun 2016 08:45:49 -0700 (PDT) X-Received: by 10.107.46.84 with SMTP id i81mr90872ioo.67.1466005547900; Wed, 15 Jun 2016 08:45:47 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id q66si31859208pfi.216.2016.06.15.08.45.42; Wed, 15 Jun 2016 08:45:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 49A116E987; Wed, 15 Jun 2016 15:45:41 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4EB866E987 for ; Wed, 15 Jun 2016 15:45:39 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0MX0eS-1asBXH1PGu-00W1BA; Wed, 15 Jun 2016 17:44:31 +0200 From: Arnd Bergmann To: Michal Marek Subject: [PATCH v2 10/11] rtlwifi: don't add include path for rtl8188ee Date: Wed, 15 Jun 2016 17:45:52 +0200 Message-Id: <20160615154553.3177021-11-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160615154553.3177021-1-arnd@arndb.de> References: <20160615154553.3177021-1-arnd@arndb.de> X-Provags-ID: V03:K0:Lm6gZAvWPHTaMITDC1Pi5q6bY0ET7kkO7ixIIWmgbT5aJ8pKOfj lBE92Qw0uW9K15adkC1TaehbzB27zxV2/JxN71T+dFe0EgfX+CeGdDSgliO7Ldp+OArkWDC j6F7+QGdZT7pMBQlRF+QpKyzKBh8q0Cpa672O4XO8kj/LCfxn3vFVu/YG4CwmU4cuGRwDdS o6UKXmebpn5SLYGZ3zF8w== X-UI-Out-Filterresults: notjunk:1; V01:K0:AKbWfG+R1Xc=:4oIE29WVHTks9x03Dl8JXP u7MqK6GKZi2TA3xz/GpvEoi0WAs7NvxUv9lV5c9PgIrUEPllrbxeP7k5/n1bH2+xfmJyA4xwc bYhPFwOu5XG3BQMpmjQxKXPVxDKdDHLgmICdjuF1R23T98EEnvzblmLBJ+eYzVqTL/udIH8Os bEEaejHDaq3KNX9sxNVskTjgB1Awg8W14QjAc6f4L1/d9Cg+ydkEqED5f3toHv8oy+ONoDByv c8V/R9e4M6w4ZMQvuwLZg86dmcC8oiPzN0Lp0sT4zT/I6dwfo1psPv/clES71f5GsvwM2ZdMQ 1F0YgAa/YEFVnl3XW/BL2kxS3BRIuU7x2tT4DXNr6UELUAlsz5RQqDqO7ZopQONStiFfKuC9n coleGWgKSKnl/QZim7ez5oaJ/U6JmzLAgAlfjJ1c900X418/xAKLh0Kl8EZCVQvAtqVmvEUSP AStDPEVDzzSGZyNWKPXUc+fhYEN4r8Zy9+57L8pC6Y+/dc4h3t9/8Og5u2wrRtA67S8DoSm3R DYr+dwz42RaV++6ne6nqz9u7c3H/3X9swG9ViL4vOO2ga3o/fiR4jjsenwVS20ihXhjX9yaVB 2Qvkn91nROChjDDTJAB7abRpvxca2FGTUiWWqAjZ7QXkKTlM39L15R6CK02Oon80Ya9i7otLU Z7+vWYJtCkCSB08SzoJX0gEZUue/xWg+SYu/hlhEoh0/ytC5TXxfEaypqBkTobDzXLFI= Cc: Arnd Bergmann , linux-kbuild@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" For rtl8188ee, we pass -Idrivers/net/wireless/rtlwifi/ to gcc, however that directy no longer exists, so evidently this option is no longer required here and can be removed to avoid a warning when building with 'make W=1' or 'gcc -Wmissing-include-dirs' Signed-off-by: Arnd Bergmann --- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile index a85419a37651..676e7de27f27 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile @@ -12,4 +12,4 @@ rtl8188ee-objs := \ obj-$(CONFIG_RTL8188EE) += rtl8188ee.o -ccflags-y += -Idrivers/net/wireless/rtlwifi -D__CHECK_ENDIAN__ +ccflags-y += -D__CHECK_ENDIAN__