diff options
| author | Raghuram Subramani <raghus2247@gmail.com> | 2024-12-05 14:22:08 +0530 |
|---|---|---|
| committer | Raghuram Subramani <raghus2247@gmail.com> | 2024-12-05 14:22:08 +0530 |
| commit | 35bf88114de32d17f1e0b2737f44158bdc99a9e9 (patch) | |
| tree | 682a14421360607c84f66a0ed14db7d876454f9d | |
| parent | 08c83700647518d8c65c4f63e3d4373e5ab42095 (diff) | |
| parent | 6a21d8496b038d1e71fd6a9bd8a95880135665d9 (diff) | |
Merge remote-tracking branch 'ssh/master' into lineage-22lineage-22
Change-Id: I18fa3f8332fea12d5cf8f21d71baebafe3add84c
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | drivers/staging/qcacld-2.0/Kbuild | 2 |
2 files changed, 3 insertions, 13 deletions
@@ -309,7 +309,7 @@ HOSTCC = gcc HOSTCXX = g++ endif -HOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89 +HOSTCFLAGS := -O2 -fomit-frame-pointer -std=gnu89 HOSTCXXFLAGS = -O2 # Decide whether to build built-in, modular, or both. @@ -403,10 +403,9 @@ LINUXINCLUDE := \ KBUILD_CPPFLAGS := -D__KERNEL__ -KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ +KBUILD_CFLAGS := -Wundef -Wno-trigraphs \ -fno-strict-aliasing -fno-common \ - -Werror-implicit-function-declaration \ - -Wno-format-security \ + -Wno-format-security -Wno-incompatible-function-pointer-types -Wno-enum-conversion \ -std=gnu89 $(call cc-option,-fno-PIE) ifeq ($(TARGET_BOARD_TYPE),auto) @@ -682,10 +681,6 @@ KBUILD_CFLAGS += -O2 endif endif -ifdef CONFIG_CC_WERROR -KBUILD_CFLAGS += -Werror -endif - # Tell gcc to never replace conditional load with a non-conditional one KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0) KBUILD_CFLAGS += $(call cc-option,-fno-allow-store-data-races) @@ -887,9 +882,6 @@ KBUILD_CFLAGS += $(call cc-option,-fconserve-stack) # disallow errors like 'EXPORT_GPL(foo);' with missing header KBUILD_CFLAGS += $(call cc-option,-Werror=implicit-int) -# require functions to have arguments in prototypes, not empty 'int foo()' -KBUILD_CFLAGS += $(call cc-option,-Werror=strict-prototypes) - # Prohibit date/time macros, which would make the build non-deterministic KBUILD_CFLAGS += $(call cc-option,-Werror=date-time) diff --git a/drivers/staging/qcacld-2.0/Kbuild b/drivers/staging/qcacld-2.0/Kbuild index 7c97483cbff8..49fabbcde4c6 100644 --- a/drivers/staging/qcacld-2.0/Kbuild +++ b/drivers/staging/qcacld-2.0/Kbuild @@ -1059,8 +1059,6 @@ CDEFINES := -DANI_LITTLE_BYTE_ENDIAN \ -DANI_LOGDUMP \ -DWLAN_PERF \ -DPTT_SOCK_SVC_ENABLE \ - -Wall\ - -Werror\ -D__linux__ \ -DHAL_SELF_STA_PER_BSS=1 \ -DWLAN_FEATURE_VOWIFI_11R \ |