Skip to content

Commit

Permalink
fixed qcacld-2 compilation errors when using new gcc 10
Browse files Browse the repository at this point in the history
  • Loading branch information
Thiviyan committed Sep 4, 2020
1 parent 1e20d62 commit e3a88e1
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 11 deletions.
11 changes: 11 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -618,9 +618,20 @@ 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, attribute-alias)
KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
KBUILD_CFLAGS += $(call cc-disable-warning, stringop-overflow)
KBUILD_CFLAGS += $(call cc-disable-warning, fortify-source)
KBUILD_CFLAGS += $(call cc-disable-warning, unsequenced)
KBUILD_CFLAGS += $(call cc-disable-warning, incompatible-pointer-types)
KBUILD_CFLAGS += $(call cc-disable-warning, psabi)
KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
KBUILD_AFLAGS += $(call cc-option,-fno-PIE)

# REVERTME
KBUILD_CFLAGS += $(call cc-disable-warning, unused-function)
KBUILD_CFLAGS += $(call cc-disable-warning, missing-attributes)
KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,)

ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,)
else
Expand Down
9 changes: 5 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
export KBUILD_BUILD_USER=S133PY
export ARCH=arm64
#export CROSS_COMPILE=/mnt/kernels/caf_kernel_zte_msm8996/toolchains/gcc10/bin/aarch64-linux-gnu-
#export CROSS_COMPILE=/home/sleepy/android/toolchains/GCC-10/bin/aarch64-linux-elf-
export CROSS_COMPILE=/home/sleepy/Lineage-GCC/android_prebuilts_gcc_linux-x86_aarch64_aarch64-linux-android-4.9/bin/aarch64-linux-android-
export CROSS_COMPILE_ARM32=/home/sleepy/Lineage-GCC/android_prebuilts_gcc_linux-x86_arm_arm-linux-androideabi-4.9/bin/arm-linux-androideabi-
#export CROSS_COMPILE_ARM32=/mnt/kernels/caf_kernel_zte_msm8996/toolchains/arm32-gcc/bin/arm-eabi-
export CROSS_COMPILE=/home/sleepy/android/toolchains/GCC-10/bin/aarch64-linux-elf-
#export CROSS_COMPILE=/home/sleepy/Lineage-GCC/android_prebuilts_gcc_linux-x86_aarch64_aarch64-linux-android-4.9/bin/aarch64-linux-android-
#export CROSS_COMPILE_ARM32=/home/sleepy/Lineage-GCC/android_prebuilts_gcc_linux-x86_arm_arm-linux-androideabi-4.9/bin/arm-linux-androideabi-
export CROSS_COMPILE_ARM32=/mnt/kernels/caf_kernel_zte_msm8996/toolchains/arm32-gcc/bin/arm-eabi-


BUILD="/mnt/kernels/caf_kernel_zte_msm8996/build"
Expand All @@ -26,6 +26,7 @@ make O="$BUILD" -j8 INSTALL_MOD_PATH=MODULES_OUT modules_install

mkdir -p $OUT/modules
mv "$BUILD/arch/arm64/boot/Image.gz-dtb" "$OUT/Image.gz-dtb"
rm -rf $OUT
mv "$BUILD/MODULES_OUT" "$OUT/modules"

echo "Image.gz-dtb & modules can be found in $BUILD"
Expand Down
8 changes: 1 addition & 7 deletions drivers/staging/qcacld-2.0/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -1835,13 +1835,7 @@ endif

KBUILD_CPPFLAGS += $(CDEFINES)

# Currently, for versions of gcc which support it, the kernel Makefile
# is disabling the maybe-uninitialized warning. Re-enable it for the
# WLAN driver. Note that we must use EXTRA_CFLAGS here so that it
# will override the kernel settings.
ifeq ($(call cc-option-yn, -Wmaybe-uninitialized),y)
EXTRA_CFLAGS += -Wmaybe-uninitialized
endif


ifeq ($(call cc-option-yn, -Wheader-guard),y)
EXTRA_CFLAGS += -Wheader-guard
Expand Down

0 comments on commit e3a88e1

Please sign in to comment.