From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id ADDE6385840C; Tue, 21 Nov 2023 20:49:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ADDE6385840C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1700599772; bh=FWHlnHRYa4wZkzHG95ZPD8hwEgx2ITm+e4+1EvacLa0=; h=From:To:Subject:Date:From; b=WG3oXB42TW66UE2X4MmNxxzkzlF/psIaYIxvEDe0hjtsbQN0i5S5+LGe0pzFys9ZL mx51KMJ9GW/MOs41m0bErEjwuTlZHE8wiSHjvJoUUzGSpdIVPyiFBEN50T3Mvzrub2 ufhECX44VECbGLMA8bJiQjUHMPaYhuZYnSXw1l0Q= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] elf: Remove any_debug from dl_main_state X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 55f41ef8de4a4d0c5762d78659e11202d3c765d4 X-Git-Newrev: a0f9bfc3a5cc10920787d70d0653720a8fa013f3 Message-Id: <20231121204932.ADDE6385840C@sourceware.org> Date: Tue, 21 Nov 2023 20:49:32 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a0f9bfc3a5cc10920787d70d0653720a8fa013f3 commit a0f9bfc3a5cc10920787d70d0653720a8fa013f3 Author: Adhemerval Zanella Date: Mon Nov 6 17:25:48 2023 -0300 elf: Remove any_debug from dl_main_state Its usage can be implied by the GLRO(dl_debug_mask). Reviewed-by: Siddhesh Poyarekar Diff: --- elf/dl-main.h | 3 --- elf/rtld.c | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/elf/dl-main.h b/elf/dl-main.h index 92766d06b4..f876904cb6 100644 --- a/elf/dl-main.h +++ b/elf/dl-main.h @@ -97,9 +97,6 @@ struct dl_main_state /* True if program should be also printed for rtld_mode_trace. */ bool mode_trace_program; - /* True if any of the debugging options is enabled. */ - bool any_debug; - /* True if information about versions has to be printed. */ bool version_info; }; diff --git a/elf/rtld.c b/elf/rtld.c index a09cf2a9df..7d4c843e7e 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -300,7 +300,6 @@ dl_main_state_init (struct dl_main_state *state) state->glibc_hwcaps_prepend = NULL; state->glibc_hwcaps_mask = NULL; state->mode = rtld_mode_normal; - state->any_debug = false; state->version_info = false; } @@ -2481,7 +2480,6 @@ process_dl_debug (struct dl_main_state *state, const char *dl_debug) && memcmp (dl_debug, debopts[cnt].name, len) == 0) { GLRO(dl_debug_mask) |= debopts[cnt].mask; - state->any_debug = true; break; } @@ -2676,7 +2674,7 @@ process_envvars (struct dl_main_state *state) /* If we have to run the dynamic linker in debugging mode and the LD_DEBUG_OUTPUT environment variable is given, we write the debug messages to this file. */ - else if (state->any_debug && debug_output != NULL) + else if (GLRO(dl_debug_mask) != 0 && debug_output != NULL) { const int flags = O_WRONLY | O_APPEND | O_CREAT | O_NOFOLLOW; size_t name_len = strlen (debug_output);