Support -g3

diff --git a/NEWS b/NEWS
index a9ed25d2d735b1f03d739384f9bfffc7e6965e5c..72f936411a55a979704d5b82bd88f5963e349ca0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ Version 0.XX
   Bug #1033027).
 - Fix tests in sid/testing by removing avr32 which is no longer supported
   (Debian Bug #1050942).
+- Accept -g3 instead of -g which enables more debug information (reported in
+  IRC OFTC/#debian-mentors).
 
 
 Version 0.13

diff --git a/bin/blhc b/bin/blhc
index 5bbcae73a63cbbebaef4a7096f6a253224ebb38b..97e8e7f5c0be8300d6cfaad0f819b794f333f4c0 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -206,7 +206,7 @@ my $file_extension_regex = qr/
 # Expected (hardening) flags. All flags are used as regexps (and compiled to
 # real regexps below for better execution speed).
 my @def_cflags = (
-    '-g',
+    '-g3?',
     '-O(?:2|3)', # keep at index 1, search for @def_cflags_debug to change it
 );
 my @def_cflags_debug = (
@@ -296,6 +296,7 @@ my @flag_refs_all = (
 # Renaming rules for the output so the regex parts are not visible. Also
 # stores string values of flag regexps above, see compile_flag_regexp().
 my %flag_renames = (
+    '-g3?'                         => '-g',
     '-O(?:2|3)'                    => '-O2',
     '-Wformat(?:=2)?'              => '-Wformat',
     '--param[= ]ssp-buffer-size=4' => '--param=ssp-buffer-size=4',

diff --git a/t/logs/good b/t/logs/good
index 9fe2a62a11f8d8b8bfc725d1c4f31dafe6c42986..143216097f37a270efc27a890d0e6d34040a4856 100644 (file)
--- a/t/logs/good
+++ b/t/logs/good
@@ -11,6 +11,7 @@ gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-se
 gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-c.c
 gcc -g -O3 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-d.c
 gcc -g -O3 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=3 -c test-e.c
+gcc -g3 -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=3 -c test-e.c
 gcc -Wl,-z,relro -o test test-a.o test-b.o test-c.o -ltest
 
 # -Wformat-security is implied by -Werror=format-security and no longer used