From patchwork Thu Mar 14 16:31:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 87200 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7C44F384CBA0 for ; Thu, 14 Mar 2024 16:31:13 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 2E7083857839 for ; Thu, 14 Mar 2024 16:30:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2E7083857839 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2E7083857839 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710433846; cv=none; b=Di2zhSaO3c3Arp1/XSywY20izihTvXugmbGMYW6hn01bquhSxb6w1PUsVJFaenEziJZ3G+6qhLc03WPoWVZd7loOdJ9Clt+M7wS5IQO0jiMJsoru7h/5GZIAT21z+MSxWxPn9e7iG7DG3vN7fR9ASyUgZGx3oKxIALXjDSZQ1jc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710433846; c=relaxed/simple; bh=lOsYFgvT1n0F56yphFE3kEQQOAcrK0h5aPoHItWeeFE=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=VQ2SnQsZbUUXrVc4HLGCKymml6syGdMhlPG2yp8jBL1iNnCmT4IAv/vxJRI5+yqK0ljCRPtzK1byAjs+KMshlgltZXrwdqssDu3oE+ivYa/CkKz1PQwd//vnxiQUJhjMYl5DmmiAVgQCIZ3B/AwOQYQXwlTlWKWAn5lqaQ+SyIw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 159B01F84E for ; Thu, 14 Mar 2024 16:30:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710433843; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Kc6PdYpE2PKJ4mwVtwdNC5uvqihm+x821jso2UGMlZg=; b=BJkDDRzQYNibjDoRRhduYcitov09lERcpuZ4JkUJNba0Cn9exmAdwg8CYOXMwt7I0XOYpu G8bVj6rzEzOIEa6U8EmPJPtc/ByrM3NGExDwiuAM6M14HY/EmOCnhYMcbWRGQ4oZL0wGYa 5eGMjDEvs2+bgwtt8ecUBD5RQGXZp74= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710433843; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Kc6PdYpE2PKJ4mwVtwdNC5uvqihm+x821jso2UGMlZg=; b=pLz1bJG7n/vwCJ6z9mh0y7+fuToUOLjx4T5h+5mnqGJmEJe3Nh/6vYPMKcV5YpIjydlVdE H18sIYDIeZHZoeCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710433843; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Kc6PdYpE2PKJ4mwVtwdNC5uvqihm+x821jso2UGMlZg=; b=BJkDDRzQYNibjDoRRhduYcitov09lERcpuZ4JkUJNba0Cn9exmAdwg8CYOXMwt7I0XOYpu G8bVj6rzEzOIEa6U8EmPJPtc/ByrM3NGExDwiuAM6M14HY/EmOCnhYMcbWRGQ4oZL0wGYa 5eGMjDEvs2+bgwtt8ecUBD5RQGXZp74= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710433843; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Kc6PdYpE2PKJ4mwVtwdNC5uvqihm+x821jso2UGMlZg=; b=pLz1bJG7n/vwCJ6z9mh0y7+fuToUOLjx4T5h+5mnqGJmEJe3Nh/6vYPMKcV5YpIjydlVdE H18sIYDIeZHZoeCw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id F30D41368C for ; Thu, 14 Mar 2024 16:30:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id X6jgOTIm82XsPgAAD6G6ig (envelope-from ) for ; Thu, 14 Mar 2024 16:30:42 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2] [gdb/build] Fix build on postmarketos Date: Thu, 14 Mar 2024 17:31:36 +0100 Message-Id: <20240314163136.10192-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spam-Score: 3.33 X-Spamd-Result: default: False [3.33 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[sourceware.org:url]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.37)[77.06%] X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org I tried building gdbserver on postmarketos (which is based on alpine linux, which uses musl libc), and ran into: ... gdbserver/linux-low.cc: In lambda function: gdbserver/linux-low.cc:1907:41: error: \ 'W_EXITCODE' was not declared in this scope 1907 | mark_lwp_dead (leader_lp, W_EXITCODE (0, 0), true); | ^~~~~~~~~~ ... The macro W_EXITCODE is not defined in gdbsupport/gdb_wait.h. OTOH, WSETEXIT is defined there, but unused: ... /* These are not defined in POSIX, but are used by our programs. */ #ifndef WSETEXIT # ifdef W_EXITCODE #define WSETEXIT(w,status) ((w) = W_EXITCODE(status,0)) # else #define WSETEXIT(w,status) ((w) = (0 | ((status) << 8))) # endif #endif ... Fix this by dropping the WSETEXIT definition, and instead defining W_EXITCODE. Tested on x86_64-linux, in combination with an "#undef W_EXITCODE" to make sure the definition is exercised. PR build/31483 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31483 --- gdbsupport/gdb_wait.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) base-commit: 9a03f2185347bd8f20da9bf535bc68a8d0f18ce8 diff --git a/gdbsupport/gdb_wait.h b/gdbsupport/gdb_wait.h index e9e39584e6e..c6348dbcb1c 100644 --- a/gdbsupport/gdb_wait.h +++ b/gdbsupport/gdb_wait.h @@ -99,12 +99,8 @@ extern int windows_status_to_termsig (unsigned long); /* These are not defined in POSIX, but are used by our programs. */ -#ifndef WSETEXIT -# ifdef W_EXITCODE -#define WSETEXIT(w,status) ((w) = W_EXITCODE(status,0)) -# else -#define WSETEXIT(w,status) ((w) = (0 | ((status) << 8))) -# endif +#ifndef W_EXITCODE +#define W_EXITCODE(status, sig) ((status) << 8 | (sig)) #endif #ifndef W_STOPCODE