diff options
| author | David S. Miller <davem@davemloft.net> | 2018-12-22 02:06:20 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-22 02:06:20 +0300 |
| commit | ce28bb4453880759c5bdc2751629f1a865ea4a6e (patch) | |
| tree | 549617a3c6ffb55402cb403b1d808a11e113b294 /scripts | |
| parent | 64935310f2fc0128373bbbcfb5b8b49fd26e2ae8 (diff) | |
| parent | 6cafab50eea327e0d198cc9579a60440fc959756 (diff) | |
| download | linux-ce28bb4453880759c5bdc2751629f1a865ea4a6e.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Kbuild.include | 4 | ||||
| -rw-r--r-- | scripts/mod/Makefile | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index bb015551c2d9..3d09844405c9 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -115,9 +115,7 @@ __cc-option = $(call try-run,\ # Do not attempt to build with gcc plugins during cc-option tests. # (And this uses delayed resolution so the flags will be up to date.) -# In addition, do not include the asm macros which are built later. -CC_OPTION_FILTERED = $(GCC_PLUGINS_CFLAGS) $(ASM_MACRO_FLAGS) -CC_OPTION_CFLAGS = $(filter-out $(CC_OPTION_FILTERED),$(KBUILD_CFLAGS)) +CC_OPTION_CFLAGS = $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS)) # cc-option # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586) diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile index a5b4af47987a..42c5d50f2bcc 100644 --- a/scripts/mod/Makefile +++ b/scripts/mod/Makefile @@ -4,8 +4,6 @@ OBJECT_FILES_NON_STANDARD := y hostprogs-y := modpost mk_elfconfig always := $(hostprogs-y) empty.o -CFLAGS_REMOVE_empty.o := $(ASM_MACRO_FLAGS) - modpost-objs := modpost.o file2alias.o sumversion.o devicetable-offsets-file := devicetable-offsets.h |