292e742220
* add dev-package * modularize some kernel drivers * modernize Makefile to silence some warnings * fix various warnings * add some CVE patches [ci:skip-build]: already built successfully in CI
61 lines
2.4 KiB
Diff
61 lines
2.4 KiB
Diff
--- android_kernel_oppo_msm8974/Makefile.orig 2019-07-03 00:12:18.390452000 +0200
|
|
+++ android_kernel_oppo_msm8974/Makefile 2019-08-29 14:25:12.283001293 +0200
|
|
@@ -358,13 +358,21 @@ CFLAGS_KERNEL =
|
|
AFLAGS_KERNEL =
|
|
CFLAGS_GCOV = -fprofile-arcs -ftest-coverage
|
|
|
|
-
|
|
+# 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$(srctree)/include/uapi \
|
|
+ -Iinclude/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 -Iinclude \
|
|
$(if $(KBUILD_SRC), -I$(srctree)/include) \
|
|
- -include $(srctree)/include/linux/kconfig.h
|
|
+ -include $(srctree)/include/linux/kconfig.h \
|
|
+ $(USERINCLUDE)
|
|
|
|
KBUILD_CPPFLAGS := -D__KERNEL__
|
|
|
|
@@ -562,13 +570,31 @@ endif # $(dot-config)
|
|
# Defaults to vmlinux, but the arch makefile usually adds further targets
|
|
all: vmlinux
|
|
|
|
-KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,)
|
|
+KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)
|
|
+KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,)
|
|
+KBUILD_CFLAGS += $(call cc-disable-warning, format-truncation)
|
|
+KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow)
|
|
+KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)
|
|
+KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
|
|
+KBUILD_CFLAGS += $(call cc-disable-warning, misleading-indentation)
|
|
+KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)
|
|
+KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
|
|
|
|
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
|
|
-KBUILD_CFLAGS += -Os
|
|
+KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,)
|
|
+else
|
|
+ifdef CONFIG_PROFILE_ALL_BRANCHES
|
|
+KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,)
|
|
else
|
|
KBUILD_CFLAGS += -O2
|
|
endif
|
|
+endif
|
|
+
|
|
+KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \
|
|
+ $(call cc-disable-warning,maybe-uninitialized,))
|
|
+
|
|
+# Tell gcc to never replace conditional load with a non-conditional one
|
|
+KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
|
|
|
|
include $(srctree)/arch/$(SRCARCH)/Makefile
|
|
|