Message ID | 20240517083207.130391-13-poulhies@adacore.com |
---|---|
State | New |
Headers | show
Return-Path: <gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=VCuSYjEp; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4VggMZ51bRz20dJ for <incoming@patchwork.ozlabs.org>; Fri, 17 May 2024 18:38:02 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EE9213846062 for <incoming@patchwork.ozlabs.org>; Fri, 17 May 2024 08:38:00 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by sourceware.org (Postfix) with ESMTPS id ECE39384AB7F for <gcc-patches@gcc.gnu.org>; Fri, 17 May 2024 08:32:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ECE39384AB7F Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org ECE39384AB7F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::334 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715934761; cv=none; b=m+YOsSxu21rvEa2x18fdZXqs9rW66RUn/MvX4cbaDtoYaTLXQX8el4d0ZU4MRRopHiFfMLj1RdzZpldBJu14pfY4EG0q/CZmSpGaLLZMcq+kobXgGOwIO0K5lXY++/6hX2FtGr1E6+g8EppfiIRsBy3z05Oi8kbx5ji2AL8zqsU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715934761; c=relaxed/simple; bh=O/8wmuMspyVsgYeHNEtpo0CW7Ax3VTLrTgHeAhcgBIU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=GtH+iptnoN29XFd6Znq2DAQF2UDLmM1S+rrlYSUQNHz3y2Kco15lS4P23R/OquslGbiEESlqM1tck5dtEuwbHZvd2c/O7L7C8SIYm3e/bAQjlQLwfO8Omoi3g3kPfZYMxEXHda88qZTECinJdcwRlWXXfhJXnRYudU7ZxOc9Gkc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-41fd5dc0439so62786305e9.0 for <gcc-patches@gcc.gnu.org>; Fri, 17 May 2024 01:32:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1715934750; x=1716539550; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lusUbchisVNBFNaqNmL1jKMjZviZTMQ8/yRBF+6NuLw=; b=VCuSYjEpCO/fQpB1+Cb3OJ7n4ALezTGPP+IBqUuQaE1qgAZTPD3A4Fb73XpSRH7P6F lFBQZ9aMrzwNNBMWAB8G1dj3iT3PnK4AUK2+cpVoJot68YJWcZazB5TtHxjoYiKqIzZp q71O0W1cbK0nlEoUONxWFXFK5GZfs4CMKcnFq15wNiUFJKS8oFYDlxB2wTf8vSd6q86G fQxzc41MVmRJLJTC4uxWya4CbT6yObRQr4HNGli/NxDRCPKs0L+2ncw2YkIr4YPEh6/s AA8rAb4Qvp5c51cD6ifb8XX2bVf34pwXAaxsa8xTbh1K2kMleA/qzWXHzb8XERybCV/3 nRQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715934750; x=1716539550; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lusUbchisVNBFNaqNmL1jKMjZviZTMQ8/yRBF+6NuLw=; b=W5qQUTLqOXCUaLuTjjMW+Beb/+WB36M2aVB22Zhsq3HF7gJn6qNryQConDnQiJvQEb Nf3khWicAiis8x9VfZ2KTM3URuDvD4hRJEVRv5ZIycVD+AI678b02bgkS3WJAGdMl7Zt rMif2yPzFcwmgrPx7Kc9tf5dDl2i5guCR0V+tQ7SYoW2La9CzLtbBdBPoUOYqu0iXNRS HlskeUlxypP7fDkJQiJ0eY6ciVBIkFBjVuW/52wt6jn8ZVYjMwDianegzWoE8nAGyMju CqTFqpnYPVqtNDr7Rkq8m4NuUStIUpZxbhxiIRZNtZZWeNDFwTCc2WENMkv/1Sm6cXJu a7xw== X-Gm-Message-State: AOJu0YyYp5+kGP5HO/EqOwts9+f/mpQBHfqE0QcSZ++k7ngYZoxKnLbt t3zrrNspC8ACyMZ7ZnrsONzi8iRyZwTtgiXYiyYc3n7hYSpZ1Gejcd9HyTK8D4i+nn956aQBd1Y = X-Google-Smtp-Source: AGHT+IFUWv8az0yVjRIybLwZ3v7O2nqppeeDoADp+sSfDsv/y5yfnnRPBFpzRHyLpKZWk8JVxFbgdg== X-Received: by 2002:a05:600c:1d1c:b0:420:98d:e101 with SMTP id 5b1f17b1804b1-420098de3c7mr137477225e9.15.1715934749777; Fri, 17 May 2024 01:32:29 -0700 (PDT) Received: from poulhies-Precision-5550.lan ([2001:861:3382:1a90:de37:8b1c:1f33:2610]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-420273cff03sm75197045e9.26.2024.05.17.01.32.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 May 2024 01:32:29 -0700 (PDT) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= <poulhies@adacore.com> To: gcc-patches@gcc.gnu.org Cc: Sebastian Poeplau <poeplau@adacore.com> Subject: [COMMITTED 13/35] ada: Make raise-gcc.c compatible with Clang Date: Fri, 17 May 2024 10:31:45 +0200 Message-ID: <20240517083207.130391-13-poulhies@adacore.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240517083207.130391-1-poulhies@adacore.com> References: <20240517083207.130391-1-poulhies@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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 <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org |
Series |
[COMMITTED,01/35] ada: Add support for 'Object_Size to pragma Compile_Time_{Warning, Error}
|
expand
|
diff --git a/gcc/ada/raise-gcc.c b/gcc/ada/raise-gcc.c index 01cf4b6236d..7179f62529e 100644 --- a/gcc/ada/raise-gcc.c +++ b/gcc/ada/raise-gcc.c @@ -596,7 +596,15 @@ get_ip_from_context (_Unwind_Context *uw_context) #endif #if !defined(__USING_SJLJ_EXCEPTIONS__) && defined(__CHERI__) +#if __has_builtin (__builtin_code_address_from_pointer) ip = __builtin_code_address_from_pointer ((void *)ip); +#elif defined(__aarch64__) + /* Clang doesn't have __builtin_code_address_from_pointer to abstract over + target-specific differences. On AArch64, we need to drop the LSB of the + instruction pointer because it's not part of the address; it indicates the + CPU mode. */ + ip &= ~1UL; +#endif #endif /* Subtract 1 if necessary because GetIPInfo yields a call return address
From: Sebastian Poeplau <poeplau@adacore.com> The Morello variant of Clang doesn't have __builtin_code_address_from_pointer; work around it where necessary. gcc/ada/ * raise-gcc.c: Work around __builtin_code_address_from_pointer if it is unavailable. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/raise-gcc.c | 8 ++++++++ 1 file changed, 8 insertions(+)