Merge pull request #170 from nathanchance/fix-4.19

patches: 4.19: x86_64: Update after 4.19.48 release

Author: nathanchance

patches/4.19/x86_64/0001-DO-NOT-UPSTREAM-x86-Avoid-warnings-errors-due-to-lac.patch

@@ -1,64 +1,82 @@
-From 28e98de6638031d0ab539469ab0387a95f2d3316 Mon Sep 17 00:00:00 2001
+From f5de4c534f03c9d8c81bd35aac8512a5396378a7 Mon Sep 17 00:00:00 2001
 From: Nathan Chancellor <[email protected]>
 Date: Tue, 25 Sep 2018 13:32:33 -0700
 Subject: [PATCH] DO-NOT-UPSTREAM: x86: Avoid warnings/errors due to lack of
  asm goto
 
-This isn't strictly required right now and it prevents us from building
-with Clang. It's supposedly in the works though, progress can be tracked
-below.
+We don't want to see an inordinate amount of warning spam from
+the BPF samples and after reverting commits 4a789213c9a5 ("x86
+uaccess: Introduce __put_user_goto") and a959dc88f9c8 ("Use
+__put_user_goto in __put_user_size() and unsafe_put_user()"), we
+can successfully compile an x86 kernel with Clang.
+
+This is obviously not a long term solution. LLVM/Clang support for
+asm goto can be tracked at the below link.
 
 Link: https://github.com/ClangBuiltLinux/linux/issues/6
 Signed-off-by: Nathan Chancellor <[email protected]>
 ---
- arch/x86/Makefile                     | 3 +--
+ arch/x86/Makefile                     | 9 +++++----
  arch/x86/boot/compressed/Makefile     | 3 +++
  drivers/firmware/efi/libstub/Makefile | 4 ++++
- 3 files changed, 8 insertions(+), 2 deletions(-)
+ 3 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
-index 75ef499a66e2..bb705df20a68 100644
+index ce0d0424a53d..094a0f11c943 100644
 --- a/arch/x86/Makefile
 +++ b/arch/x86/Makefile
-@@ -301,8 +301,7 @@ vdso_install:
+@@ -235,6 +235,11 @@ ifdef CONFIG_RETPOLINE
+   endif
+ endif
+ 
++# Avoid warnings in arch/x86/include/asm/cpufeature.h when building with Clang
++ifndef CONFIG_CC_HAS_ASM_GOTO
++  KBUILD_CFLAGS += -D__BPF_TRACING__
++endif
++
+ archscripts: scripts_basic
+ 	$(Q)$(MAKE) $(build)=arch/x86/tools relocs
+ 
+@@ -305,10 +310,6 @@ vdso_install:
+ 
  archprepare: checkbin
  checkbin:
- ifndef CC_HAVE_ASM_GOTO
+-ifndef CONFIG_CC_HAS_ASM_GOTO
 -	@echo Compiler lacks asm-goto support.
 -	@exit 1
-+KBUILD_CFLAGS += -D__BPF_TRACING__
- endif
+-endif
  ifdef CONFIG_RETPOLINE
  ifeq ($(RETPOLINE_CFLAGS),)
+ 	@echo "You are building kernel with non-retpoline compiler." >&2
 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
-index 466f66c8a7f8..deb2a7fef08c 100644
+index 466f66c8a7f8..000bd188beb0 100644
 --- a/arch/x86/boot/compressed/Makefile
 +++ b/arch/x86/boot/compressed/Makefile
 @@ -38,6 +38,9 @@ KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
  KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
  KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
  KBUILD_CFLAGS += -Wno-pointer-sign
-+ifndef CC_HAVE_ASM_GOTO
++ifndef CONFIG_CC_HAS_ASM_GOTO
 +KBUILD_CFLAGS += -D__BPF_TRACING__
 +endif
 
  KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
 diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile
-index c51627660dbb..167572144766 100644
+index d9845099635e..68ff33dc075d 100644
 --- a/drivers/firmware/efi/libstub/Makefile
 +++ b/drivers/firmware/efi/libstub/Makefile
-@@ -21,6 +21,10 @@ cflags-$(CONFIG_ARM)		:= $(subst -pg,,$(KBUILD_CFLAGS)) \
+@@ -24,6 +24,10 @@ cflags-$(CONFIG_ARM)		:= $(subst -pg,,$(KBUILD_CFLAGS)) \
 
  cflags-$(CONFIG_EFI_ARMSTUB)	+= -I$(srctree)/scripts/dtc/libfdt
 
-+ifndef CC_HAVE_ASM_GOTO
++ifndef CONFIG_CC_HAS_ASM_GOTO
 +cflags-$(CONFIG_X86)		+= -D__BPF_TRACING__
 +endif
 +
  KBUILD_CFLAGS			:= $(cflags-y) -DDISABLE_BRANCH_PROFILING \
  				   -D__NO_FORTIFY \
  				   $(call cc-option,-ffreestanding) \
 -- 
-2.20.0
+2.22.0.rc3