Changes in meson/part/compiler_args/meson.build [18969ce:3fcea34] in mainline

File:

• meson/part/compiler_args/meson.build (modified) (6 diffs)

meson/part/compiler_args/meson.build

@@ -42 +42 @@
         '-Wl,--warn-common',
         '-Wl,--fatal-warnings',
+        '-Wl,-z,text',
         language : [ 'c', 'cpp' ],
 )
@@ -57 +58 @@
 
         '-Wa,--fatal-warnings',
+        '-Wl,-z,text',
 
         '-Wall',
         '-Wextra',
-        '-Werror-implicit-function-declaration',
         '-Wwrite-strings',
         '-Wunknown-pragmas',
@@ -69 +70 @@
 
         '-ffunction-sections',
+        '-fdata-sections',
         '-fno-common',
-        '-fdebug-prefix-map=' + meson.source_root() + '=.',
+        '-fdebug-prefix-map=' + meson.source_root() + '/=',
+        '-fdebug-prefix-map=../../=',
 ]
 
@@ -87 +90 @@
 
 if CONFIG_LINE_DEBUG
-        extra_common_flags += [ '-gdwarf-4', '-g3' ]
+        extra_common_flags += [ '-gdwarf-5', '-g3' ]
 endif
 
 extra_cflags = extra_common_flags + [
         '-Wmissing-prototypes',
+        '-Werror-implicit-function-declaration',
 
         '-Wno-missing-braces',
@@ -110 +114 @@
 extra_cppflags = extra_common_flags + [
         '-fno-exceptions',
+        '-Wno-misleading-indentation',
         '-frtti',
 ]
@@ -128 +133 @@
         add_project_link_arguments(extra_cflags, language : [ lang ])
 endforeach
+
+# This flag is needed at several places, hence we define it here.
+#
+# For backwards compatibility we try to detect --no-warn-rwx-segments.
+# However, the autodetection done by Meson also results in
+# "cannot find entry symbol _start; defaulting to 00000000004000b0"
+# thus the option is never supported alone. So when detecting we also
+# specify --entry=main so that the stub source provided by Meson is build
+# correctly.
+ldflags_ignore_rwx_segments = []
+if cc.has_link_argument('-Wl,--no-warn-rwx-segments,--entry=main')
+    ldflags_ignore_rwx_segments += ['-Wl,--no-warn-rwx-segments']
+endif