diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-14 07:07:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-14 07:07:36 +0200 |
| commit | 27d6e47f8e133167af51a3e39548cd3e9bed07da (patch) | |
| tree | 069abe69fc8e247ef9ca4443afc11d04aa1e723c /arch/mips/vdso/Makefile | |
| parent | 9dc86c234e845a5f60c5af013e647795c784df87 (diff) | |
| parent | 4f5cafb5cb8471e54afdc9054d973535614f7675 (diff) | |
Merge 5.4-rc3 into staging-next
We want the staging driver fixes in here as well to build on and test
with.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/vdso/Makefile')
| -rw-r--r-- | arch/mips/vdso/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile index 69cfa0a5339e..996a934ece7d 100644 --- a/arch/mips/vdso/Makefile +++ b/arch/mips/vdso/Makefile @@ -15,6 +15,7 @@ ccflags-vdso := \ $(filter -mmicromips,$(KBUILD_CFLAGS)) \ $(filter -march=%,$(KBUILD_CFLAGS)) \ $(filter -m%-float,$(KBUILD_CFLAGS)) \ + $(filter -mno-loongson-%,$(KBUILD_CFLAGS)) \ -D__VDSO__ ifdef CONFIG_CC_IS_CLANG @@ -59,7 +60,7 @@ CFLAGS_REMOVE_vgettimeofday.o = -pg ifndef CONFIG_CPU_MIPSR6 ifeq ($(call ld-ifversion, -lt, 225000000, y),y) $(warning MIPS VDSO requires binutils >= 2.25) - obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y)) + obj-vdso-y := $(filter-out vgettimeofday.o, $(obj-vdso-y)) ccflags-vdso += -DDISABLE_MIPS_VDSO endif endif |