From patchwork Fri Jul 12 00:55:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 1959632 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=golang-org.20230601.gappssmtp.com header.i=@golang-org.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=udmQ15UG; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WKtT51qv3z1xqc for ; Fri, 12 Jul 2024 10:56:25 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4F97D3875470 for ; Fri, 12 Jul 2024 00:56:23 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-yw1-x1129.google.com (mail-yw1-x1129.google.com [IPv6:2607:f8b0:4864:20::1129]) by sourceware.org (Postfix) with ESMTPS id 715A3385E83A for ; Fri, 12 Jul 2024 00:55:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 715A3385E83A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=golang.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=golang.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 715A3385E83A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1129 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720745759; cv=none; b=qkgur0C0dww5Rb/2TsfJHuj7zqwVvT1wzyYnTgFPNULadUnVoL2nReyOXIB9kKYtwG6NAjePttaPY/miZ88jrdrlA+LpZ5TBbPQpA4Nw1ZX4duk608jbAQhrmNc+JeRBK8vhs7l2qwO14KAr45hbSQpqmsWMXZfbo1jCqycr5Ys= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1720745759; c=relaxed/simple; bh=Vsw4uXiG9jb4DAfQahdk+ub7eaDqL1fGkN1nvqyXRTg=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=o2Lms1Z2QKVz8BkE8xcKPmfNZpf6wsA1YFa2EbsnpUXYnYwoDqjjPXQ7Y8Hjh561Yybzqg5hqr7XrofIgn46z50tpgBt/Gi5HLRLJmf1ihF1nsASdxEHkpwO/LZMzDp8vuCJOqugkBrMXm3+xCsOU8woUK+k+lk+PSTNUHC2itc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-yw1-x1129.google.com with SMTP id 00721157ae682-64b5617ba47so14358467b3.3 for ; Thu, 11 Jul 2024 17:55:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=golang-org.20230601.gappssmtp.com; s=20230601; t=1720745754; x=1721350554; darn=gcc.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=tXWRpLu4qc6VHlBb5T9nPLdb1lhCEbtQmoWVp/fPvPI=; b=udmQ15UGz5pU5Te+sB02K1/3uvPeaRLtWshgNu7xPKFgxbjlI1GgIKev1lN2NO9aU2 Cb2aNXHK0m+NvYmYNlvl+iGgJp/WALfuVQohwl12ab3EsM+I+L41ANy38DBsosS2gBuQ KaVSFyBTN0s7m7UyiP3PUJaU2caZBPZnly0BILbxFCEQ7b087HhG8W0LoZi7Zhb4kgLG BdR+4OG/QpvWlHGO86MzQsLo2vSR0+ryC0MbsWexodUmjdeT1Fq+7yKkYDNxtr2lsGXl rMsnnN7hsSg/pJgC8U4cNCQTizIUWSWKDpr1dsMeAKPLAcS2BJ7in+GBP8QOSJeP5D8J ayDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720745754; x=1721350554; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=tXWRpLu4qc6VHlBb5T9nPLdb1lhCEbtQmoWVp/fPvPI=; b=br/6L8gS25nQe9Hsm3K7GcUW1+skQ9HT8KccJheh7d95AXTKiySlyJrPp9zFEM4Vpk c2BNJda6ATMo6FhmBXPd8TEqTPr2YUmWM67HRUJx1zGSWy/Ck9wg88/lO9/ErHvoHReX C4MLnumlFLLy81BtSlcv7EPb+SVBhd1es5BSr3VnHKuB4t2mOeTZgUso2c8eXfA8jUxa NguGRnTtbvnhGCzLPVIKa7tJh2CJgY/SF8xQnkxy7uOGTylS/U59IvgwNlKbDwwsF/GK UPlq/02nLgrQdorIVwB9HnYh0E/oPnt0tbmfq0/VweUvFsASpI7kr2BExj+1bJSI/7d/ oRzQ== X-Gm-Message-State: AOJu0YxV4JaiVAOwrCT2CyHvzvdfb6wB64Wkmcau0pwV5zYPi8AV5cpo TaJdavibNgYIVSvdfqNUybf2CYRkwwftJcyz8BCh5CeOtTFTb7ruBqNGb8/ZJvgn3gQk2B0eFXH hX7LIay02/AJIv5Dtt0aM97ZVqlDhEOKujfJB4AR4GGKNgVNJaJk= X-Google-Smtp-Source: AGHT+IH4j0gPCF3fVUteHXTyf9BVbBJfGKmg/Cf0oDPiv8lfsWgtB0RvWHEFaJjuujpjxp0zxPtLK60a1LkJuS49weA= X-Received: by 2002:a05:690c:a93:b0:615:1cbb:7b81 with SMTP id 00721157ae682-658f0dc327fmr125184847b3.46.1720745754366; Thu, 11 Jul 2024 17:55:54 -0700 (PDT) MIME-Version: 1.0 From: Ian Lance Taylor Date: Thu, 11 Jul 2024 17:55:42 -0700 Message-ID: Subject: libbacktrace patch committed: Correctly gather Mach-O symbols To: gcc-patches X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org The libbacktrace symbol table code was incorrectly discarding global Mach-O symbols. This patch fixes the problem. Tested on macOS on the compile farm, and also on x86_64-pc-linux-gnu. Committed to mainline. Ian For PR libbacktrace/97082 * macho.c (MACH_O_N_EXT): Don't define. (MACH_O_N_UNDF): Define. (macho_defined_symbol): Don't discard N_EXT symbols. Do discard N_UNDF symbols. af827b2ab90b9d726c7182c41fa2409005909db8 diff --git a/libbacktrace/macho.c b/libbacktrace/macho.c index 5ceff05b29a..8f768f14a57 100644 --- a/libbacktrace/macho.c +++ b/libbacktrace/macho.c @@ -271,12 +271,14 @@ struct macho_nlist_64 /* Value found in nlist n_type field. */ -#define MACH_O_N_EXT 0x01 /* Extern symbol */ +#define MACH_O_N_STAB 0xe0 /* Stabs debugging symbol */ +#define MACH_O_N_TYPE 0x0e /* Mask for type bits */ + +/* Values found after masking with MACH_O_N_TYPE. */ +#define MACH_O_N_UNDF 0x00 /* Undefined symbol */ #define MACH_O_N_ABS 0x02 /* Absolute symbol */ -#define MACH_O_N_SECT 0x0e /* Defined in section */ +#define MACH_O_N_SECT 0x0e /* Defined in section from n_sect field */ -#define MACH_O_N_TYPE 0x0e /* Mask for type bits */ -#define MACH_O_N_STAB 0xe0 /* Stabs debugging symbol */ /* Information we keep for a Mach-O symbol. */ @@ -492,10 +494,10 @@ macho_defined_symbol (uint8_t type) { if ((type & MACH_O_N_STAB) != 0) return 0; - if ((type & MACH_O_N_EXT) != 0) - return 0; switch (type & MACH_O_N_TYPE) { + case MACH_O_N_UNDF: + return 0; case MACH_O_N_ABS: return 1; case MACH_O_N_SECT: