From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id EF0B73858409 for ; Mon, 28 Nov 2022 12:04:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EF0B73858409 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wm1-x329.google.com with SMTP id p13-20020a05600c468d00b003cf8859ed1bso8196375wmo.1 for ; Mon, 28 Nov 2022 04:04:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BR+el4ucljNhT+RPObFcsYCSzR/8w30ebXYgnceo1ZE=; b=cR0LqGLXhMguFiwBvEsiHg/GYQAeY56AaxcoLr3F6dqLRKl9YqJG4mT2m8RGItL6dX StCzcrDqWBf6dT6buNoh4BoCaRTK9HOJk5Gfs1Om2vzBQTI/K59fMbj88++ShqxfRn2G p09X642Xw0AB/P7VvEjgNsKfnhNBl0n+tdPMHZJvkMYm8JuRmUxLsbnwlShlFEyGwXMf 0muem5bR8YIDU5W+GkZnBeaqR2bdYzEQMc4b839ts1PqB1AWymKQONH2UWx3lHz3IWeR Uns0JIedJJLejUrJNcBKDuz9Sw4PKn3rKwDvtNI1jR6I3KSikY0PF65SdwDGeF9TrjcZ caFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BR+el4ucljNhT+RPObFcsYCSzR/8w30ebXYgnceo1ZE=; b=5p5WZ1VwZg9G9FVt+To77ZdrdnUGjrlchyH6bQGeQlM8aq4BJPTtF6+JIbpfNaL0Su lDG0hUo8jDcJM4U3aS+/au94YJOBoVOSo7H7bVaVzGAMiC/iP2OIXy38XBEL71EeC2Lb 5MP5Vi5Th6l49dT9Gj4L2DdNG9CuvbJQmTX+wFW8Datkbwu9w5D7xToZNSpNQpvwM/Yl fWTT5D6ofAe7FKjqICEgRaMIYHvzhOmtW5IC0FeHVuQhvX5lqfcvEbmd5E39GSVhzden /X73c+8PO4dfDOLDw4GmKN3/ky4fZDHpGi9Z+EqKz8ZO3kKNiirey0ZBE8FAWKbigy6g SCKg== X-Gm-Message-State: ANoB5pnXf3inSRK0JWdSUVEjnGq7tZilxT2xUg2k2JPhATI7mc/YeIZL AS8Soyloh7jPLwabvDtLUwubVlpadbUVqA== X-Google-Smtp-Source: AA0mqf7F1lPNw/CTlpVurWO9s06QMmir+MEodGcNC1iD5ICvYzIjM4mmazwr441CnbhWlxUvDg+Xtg== X-Received: by 2002:a05:600c:4194:b0:3cf:5080:412c with SMTP id p20-20020a05600c419400b003cf5080412cmr39196693wmh.99.1669637094735; Mon, 28 Nov 2022 04:04:54 -0800 (PST) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id n2-20020a5d4002000000b00241727795c4sm12572852wrp.63.2022.11.28.04.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Nov 2022 04:04:54 -0800 (PST) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED] ada: Add PIE support to backtraces on Linux Date: Mon, 28 Nov 2022 13:04:51 +0100 Message-Id: <20221128120451.171477-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.5 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 List-Id: From: Eric Botcazou gcc/ada/ * adaint.c [Linux]: Include . (__gnat_get_executable_load_address) [Linux]: Enable. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/adaint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 199dbe0e405..d2604ca9b77 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -3524,6 +3524,8 @@ __gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, cpu_set_t *set) #if defined (__APPLE__) #include +#elif defined (__linux__) +#include #endif const void * @@ -3532,10 +3534,8 @@ __gnat_get_executable_load_address (void) #if defined (__APPLE__) return _dyld_get_image_header (0); -#elif 0 && defined (__linux__) - /* Currently disabled as it needs at least -ldl. */ +#elif defined (__linux__) struct link_map *map = _r_debug.r_map; - return (const void *)map->l_addr; #elif defined (_WIN32) -- 2.34.1