Use new meson strict warning system

Meson includes warning_level=everything as of version 1.0.0, which supercedes
maintaining redundant lists of warning flags here.

2 files changed, 12 insertions, 162 deletions

diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build
index 0fabf3bf..508bbbd5 100644
--- a/meson/suppressions/meson.build
+++ b/meson/suppressions/meson.build
@@ -11,10 +11,12 @@
 # C #
 #####
 
+warning_level = get_option('warning_level')
+
 if is_variable('cc')
   c_suppressions = []
 
-  if get_option('strict')
+  if warning_level == 'everything'
     if cc.get_id() == 'clang'
       c_suppressions += [
         '-Wno-cast-align',
@@ -27,12 +29,6 @@ if is_variable('cc')
         '-Wno-padded',
       ]
 
-      if host_machine.system() == 'freebsd'
-        c_suppressions += [
-          '-Wno-c11-extensions',
-        ]
-      endif
-
       if host_machine.system() == 'windows'
         c_suppressions += [
           '-Wno-deprecated-declarations',
@@ -78,10 +74,19 @@ if is_variable('cc')
     ]
   elif cc.get_id() == 'msvc'
     c_suppressions += [
+      '/experimental:external',
+      '/external:W0',
+      '/external:anglebrackets',
       '/wd4706', # assignment within conditional expression
       '/wd4996', # POSIX name for this item is deprecated
     ]
   endif
 
+  if host_machine.system() == 'freebsd' and warning_level in ['3', 'everything']
+    c_suppressions += [
+      '-Wno-c11-extensions',
+    ]
+  endif
+
   c_suppressions = cc.get_supported_arguments(c_suppressions)
 endif
diff --git a/meson/warnings/meson.build b/meson/warnings/meson.build
deleted file mode 100644
index c0e523b9..00000000
--- a/meson/warnings/meson.build
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 2020-2022 David Robillard <d@drobilla.net>
-# SPDX-License-Identifier: 0BSD OR ISC
-
-# General code to enable approximately all warnings in GCC 12, clang, and MSVC.
-#
-# This is trivial for clang and MSVC, but GCC doesn't have an "everything"
-# option, so we need to enable everything we want explicitly.  Wall is assumed,
-# but Wextra is not, for stability.
-#
-# These are collected from common.opt and c.opt in the GCC source, and manually
-# curated with the help of the GCC documentation.  Warnings that are
-# application-specific, historical, or about compatibility between specific
-# language revisions are omitted.  The intent here is to have roughly the same
-# meaning as clang's Weverything: extremely strict, but general.  Specifically
-# omitted are:
-#
-# General:
-#
-# Wabi=
-# Waggregate-return
-# Walloc-size-larger-than=BYTES
-# Walloca-larger-than=BYTES
-# Wframe-larger-than=BYTES
-# Wlarger-than=BYTES
-# Wstack-usage=BYTES
-# Wsystem-headers
-# Wtraditional
-# Wtraditional-conversion
-# Wtrampolines
-# Wvla-larger-than=BYTES
-#
-# Build specific:
-#
-# Wpoison-system-directories
-#
-# C Specific:
-#
-# Wc11-c2x-compat
-# Wc90-c99-compat
-# Wc99-c11-compat
-# Wdeclaration-after-statement
-# Wtraditional
-# Wtraditional-conversion
-#
-# C++ Specific:
-#
-# Wc++0x-compat
-# Wc++1z-compat
-# Wc++2a-compat
-# Wctad-maybe-unsupported
-# Wnamespaces
-# Wtemplates
-
-# GCC warnings that apply to all C-family languages
-gcc_common_warnings = [
-  '-Walloc-zero',
-  '-Walloca',
-  '-Wanalyzer-too-complex',
-  '-Warith-conversion',
-  '-Warray-bounds=2',
-  '-Wattribute-alias=2',
-  '-Wbidi-chars=ucn',
-  '-Wcast-align=strict',
-  '-Wcast-qual',
-  '-Wconversion',
-  '-Wdate-time',
-  '-Wdisabled-optimization',
-  '-Wdouble-promotion',
-  '-Wduplicated-branches',
-  '-Wduplicated-cond',
-  '-Wfloat-equal',
-  '-Wformat-overflow=2',
-  '-Wformat-signedness',
-  '-Wformat-truncation=2',
-  '-Wformat=2',
-  '-Winit-self',
-  '-Winline',
-  '-Winvalid-pch',
-  '-Wlogical-op',
-  '-Wmissing-declarations',
-  '-Wmissing-include-dirs',
-  '-Wmultichar',
-  '-Wnormalized=nfc',
-  '-Wnull-dereference',
-  '-Wopenacc-parallelism',
-  '-Wpacked',
-  '-Wpadded',
-  '-Wredundant-decls',
-  '-Wshadow',
-  '-Wshift-negative-value',
-  '-Wshift-overflow=2',
-  '-Wstack-protector',
-  '-Wstrict-aliasing=3',
-  '-Wstrict-overflow=5',
-  '-Wstringop-overflow=3',
-  '-Wsuggest-attribute=cold',
-  '-Wsuggest-attribute=const',
-  '-Wsuggest-attribute=format',
-  '-Wsuggest-attribute=malloc',
-  '-Wsuggest-attribute=noreturn',
-  '-Wsuggest-attribute=pure',
-  '-Wswitch-default',
-  '-Wswitch-enum',
-  '-Wtrampolines',
-  '-Wtrivial-auto-var-init',
-  '-Wundef',
-  '-Wuninitialized',
-  '-Wunsafe-loop-optimizations',
-  '-Wunused-const-variable=2',
-  '-Wunused-macros',
-  '-Wvector-operation-performance',
-  '-Wvla',
-  '-Wwrite-strings',
-]
-
-#####
-# C #
-#####
-
-if is_variable('cc')
-  # Set all_c_warnings for the current C compiler
-  all_c_warnings = []
-
-  if cc.get_id() == 'clang'
-    all_c_warnings += ['-Weverything']
-
-    if not meson.is_cross_build()
-      all_c_warnings += [
-        '-Wno-poison-system-directories',
-      ]
-    endif
-
-  elif cc.get_id() == 'gcc'
-    all_c_warnings += gcc_common_warnings + [
-      '-Wbad-function-cast',
-      '-Wc++-compat',
-      '-Wmissing-prototypes',
-      '-Wnested-externs',
-      '-Wold-style-definition',
-      '-Wstrict-prototypes',
-      '-Wunsuffixed-float-constants',
-    ]
-
-  elif cc.get_id() == 'msvc'
-    all_c_warnings += [
-      '/Wall',
-      '/experimental:external',
-      '/external:W0',
-      '/external:anglebrackets',
-    ]
-  endif
-
-  all_c_warnings = cc.get_supported_arguments(all_c_warnings)
-  add_global_arguments(all_c_warnings, language: ['c'])
-endif