From e9339bee560db6893f2d08c1e54a3eb9f775fd1d Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 3 Mar 2023 08:45:54 +0100 Subject: [PATCH] gas: default .debug section compression method adjustments While commit b0c295e1b8d0 ("add --enable-default-compressed-debug- sections-algorithm configure option") adjusted flag_compress_debug's initializer, it didn't alter the default used when the command line option was specified with an (optional!) argument. This rendered help text inconsistent with actual behavior in certain configurations. As to help text - the default reported there clearly shouldn't be affected by a possible earlier --compress-debug-sections= option, so flag_compress_debug can't be used when emitting usage information. --- gas/as.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gas/as.c b/gas/as.c index 598bfd56cf5..62f32fc865a 100644 --- a/gas/as.c +++ b/gas/as.c @@ -228,6 +228,10 @@ print_version_id (void) #ifdef DEFAULT_FLAG_COMPRESS_DEBUG enum compressed_debug_section_type flag_compress_debug = DEFAULT_COMPRESSED_DEBUG_ALGORITHM; +#define DEFAULT_COMPRESSED_DEBUG_ALGORITHM_HELP \ + DEFAULT_COMPRESSED_DEBUG_ALGORITHM +#else +#define DEFAULT_COMPRESSED_DEBUG_ALGORITHM_HELP COMPRESS_DEBUG_NONE #endif static void @@ -256,7 +260,8 @@ Options:\n\ compress DWARF debug sections\n")), fprintf (stream, _("\ Default: %s\n"), - bfd_get_compression_algorithm_name (flag_compress_debug)); + bfd_get_compression_algorithm_name + (DEFAULT_COMPRESSED_DEBUG_ALGORITHM_HELP)); fprintf (stream, _("\ --nocompress-debug-sections\n\ @@ -764,7 +769,7 @@ This program has absolutely no warranty.\n")); #endif } else - flag_compress_debug = COMPRESS_DEBUG_GABI_ZLIB; + flag_compress_debug = DEFAULT_COMPRESSED_DEBUG_ALGORITHM; break; case OPTION_NOCOMPRESS_DEBUG: -- 2.30.2