From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 82193 invoked by alias); 29 Mar 2019 21:38:45 -0000 Mailing-List: contact dwz-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: dwz-owner@sourceware.org Received: (qmail 82165 invoked by uid 89); 29 Mar 2019 21:38:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy=c X-Spam-Status: No, score=-25.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on sourceware.org X-Spam-Level: X-HELO: mx1.suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Date: Tue, 01 Jan 2019 00:00:00 -0000 From: Tom de Vries To: dwz@sourceware.org, jakub@redhat.com Subject: [committed] Compile dwz-for-tests with -U__GNUC__ Message-ID: <20190329213932.GA13427@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-SW-Source: 2019-q1/txt/msg00161.txt.bz2 Hi, There are ifdefs in dwz.c testing for __GNUC__, which is a predefined gcc (and clang) macro. When compiling with make CC=gcc CFLAGS=-U__GNUC__, to trigger the !__GNUC__ path, we run into some warnings. Compile dwz-for-test with -U__GNUC__ to trigger the !__GNUC__ path in a regular gcc/clang build-and test cycle, and fix the resulting warnings. Committed to trunk. Thanks, - Tom Compile dwz-for-tests with -U__GNUC__ 2019-03-29 Tom de Vries * Makefile (dwz-for-test): Marking warning flags identical to dwz target. Compile with -U__GNUC__. * dwz.c [!__GNUC__] (likely, unlikely): Fix missing parentheses warning. (adjust_loclist): Fix unused parameter warning using void cast instead of __attribute__((unused)). --- Makefile | 4 ++-- dwz.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0f47a98..0ce4482 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,8 @@ py-section-script: $(CC) $(TEST_SRC)/py-section-script.s -o $@ -g || touch $@ dwz-for-test: - $(CC) $(patsubst %.o,%.c,$(OBJECTS)) -O2 -g -w -lelf -o $@ -W \ - -D_FILE_OFFSET_BITS=64 -DDWZ_VERSION='"for-test"' + $(CC) $(patsubst %.o,%.c,$(OBJECTS)) -O2 -g -lelf -o $@ -Wall -W \ + -D_FILE_OFFSET_BITS=64 -DDWZ_VERSION='"for-test"' -U__GNUC__ # On some systems we need to set and export DEJAGNU to suppress # WARNING: Couldn't find the global config file. diff --git a/dwz.c b/dwz.c index 6b6a33e..8ad613d 100644 --- a/dwz.c +++ b/dwz.c @@ -107,8 +107,8 @@ # define likely(x) __builtin_expect (!!(x), 1) # define unlikely(x) __builtin_expect (!!(x), 0) #else -# define likely(x) x -# define unlikely(x) x +# define likely(x) (x) +# define unlikely(x) (x) #endif #define obstack_chunk_alloc malloc @@ -9328,13 +9328,15 @@ write_info (void) /* Adjust .debug_loc range determined by *SLOT, called through htab_traverse. */ static int -adjust_loclist (void **slot, void *data __attribute__((unused))) +adjust_loclist (void **slot, void *data) { struct debug_loc_adjust *adj = (struct debug_loc_adjust *) *slot; unsigned char *ptr, *endsec; GElf_Addr low, high; size_t len; + (void)data; + ptr = debug_sections[DEBUG_LOC].new_data + adj->start_offset; endsec = ptr + debug_sections[DEBUG_LOC].size; while (ptr < endsec)