From a6a0f3423f3053999c0eb6e7183319c1dca6455d Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 11 May 2022 10:47:34 +0200 Subject: [PATCH] bootstrap/105551 - restore nvptx build The following makes sure to disable var-tracking if only dwarf2-line debuginfo is present. 2022-05-11 Richard Biener PR bootstrap/105551 * opts.cc (finish_options): Also disable var-tracking if !DWARF2_DEBUGGING_INFO. (cherry picked from commit e7d9fdf5e0ee4c34a880139254340b4165016289) --- gcc/opts.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gcc/opts.cc b/gcc/opts.cc index c9badd2..3a89da2 100644 --- a/gcc/opts.cc +++ b/gcc/opts.cc @@ -1334,11 +1334,15 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set, || opts->x_flag_selective_scheduling2)); /* We know which debug output will be used so we can set flag_var_tracking - and flag_var_tracking_uninit if the user has not specified them. Note - we have not yet initialized debug_hooks so we might uselessly run - var-tracking on targets without var_location debug hook support. */ + and flag_var_tracking_uninit if the user has not specified them. */ if (opts->x_debug_info_level < DINFO_LEVEL_NORMAL - || !dwarf_debuginfo_p (opts)) + || !dwarf_debuginfo_p (opts) + /* We have not yet initialized debug hooks so match that to check + whether we're only doing DWARF2_LINENO_DEBUGGING_INFO. */ +#ifndef DWARF2_DEBUGGING_INFO + || true +#endif + ) { if ((opts_set->x_flag_var_tracking && opts->x_flag_var_tracking == 1) || (opts_set->x_flag_var_tracking_uninit -- 2.7.4