From 80d966a005a94c0ab102417ae6cf0f9c364280b5 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 24 Nov 2018 17:49:20 -0500 Subject: [PATCH] ArchitectureRules: Use the same warning flags for kernel as for userland. This requires disabling some EnableWerror, as there are a lot of sign-comparison warnings triggered in certain drivers that now need to be fixed. --- build/jam/ArchitectureRules | 9 ++++----- .../kernel/drivers/network/wlan/iprowifi2200/Jamfile | 3 +-- .../kernel/drivers/network/wlan/iprowifi4965/Jamfile | 3 +-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules index cde35cdd2c..3f70e6dee0 100644 --- a/build/jam/ArchitectureRules +++ b/build/jam/ArchitectureRules @@ -516,9 +516,8 @@ rule KernelArchitectureSetup architecture } # warning flags - HAIKU_KERNEL_WARNING_CCFLAGS = -Wall -Wno-trigraphs -Wmissing-prototypes - -Wno-multichar ; - HAIKU_KERNEL_WARNING_C++FLAGS = -Wall -Wno-trigraphs -Wno-multichar ; + HAIKU_KERNEL_WARNING_CCFLAGS = $(HAIKU_WARNING_CCFLAGS_$(architecture)) ; + HAIKU_KERNEL_WARNING_C++FLAGS = $(HAIKU_WARNING_C++FLAGS_$(architecture)) ; # debug flags local level ; @@ -626,7 +625,7 @@ rule ArchitectureSetupWarnings architecture EnableWerror src add-ons kernel drivers bluetooth ; EnableWerror src add-ons kernel drivers bus ; EnableWerror src add-ons kernel drivers common ; - EnableWerror src add-ons kernel drivers disk ; +# EnableWerror src add-ons kernel drivers disk ; EnableWerror src add-ons kernel drivers dvb ; # EnableWerror src add-ons kernel drivers graphics ; EnableWerror src add-ons kernel drivers graphics intel_extreme ; @@ -649,7 +648,7 @@ rule ArchitectureSetupWarnings architecture EnableWerror src add-ons kernel file_systems iso9660 ; EnableWerror src add-ons kernel file_systems layers ; EnableWerror src add-ons kernel file_systems netfs ; - EnableWerror src add-ons kernel file_systems nfs ; +# EnableWerror src add-ons kernel file_systems nfs ; EnableWerror src add-ons kernel file_systems nfs4 ; # EnableWerror src add-ons kernel file_systems ntfs ; EnableWerror src add-ons kernel file_systems packagefs ; diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/Jamfile b/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/Jamfile index e9b723b410..314c8ee7e9 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/Jamfile +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/Jamfile @@ -13,8 +13,7 @@ Includes [ FGristFiles kernel_c++_structs.h ] SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] -Wno-format -Wno-unused - -Wno-uninitialized - -Werror ; + -Wno-uninitialized ; UseHeaders [ FDirName $(SUBDIR) ] : true ; diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile index 0f09bc165f..e562a14a23 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile @@ -9,8 +9,7 @@ UsePrivateKernelHeaders ; SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 _XOPEN_SOURCE ] -Wno-format -Wno-unused - -Wno-uninitialized - -Werror ; + -Wno-uninitialized ; UseHeaders [ FDirName $(SUBDIR) ] : true ;