From nobody Sun Jul 09 17:51:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QzZT73dDLz4mVrK; Sun, 9 Jul 2023 17:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZT73Bxfz3t0Y; Sun, 9 Jul 2023 17:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evR+BmHReQ5UMzDpD1QegmgPXk/OBBXW0322hYJkj7g=; b=FuOHVxaaR4B5BLpIyEqZ6l5TmbDA6W4tuYLWjxUbPjPZ6u8JvsKyHxXkPyreATkg2N1MC6 AEZMvhPf5FydqE+KkURn1vO/nI0Ym6buWolkO/DfvyibEME5RWoaE9JO5BB+bkzk9Lkd8U 0VX8xDIEI66tfRgzpt3OLOoyFzXt+VH7gWYL/qz82L1Z1v/kf7Y2/4dhl6Dee9ffIrYQ/i PpvKFn9xPzzBubvhXRWsPy8viPv3/4wUO4O1Pm3jU9mOqaUxrpYzCWXuvjeUM+hqsmmxNs ka5goHDD3wm3h/iL2VGJ7Y3TxyHzl994eSRhuHVuVxNzPH/GPxqtqPNf1dUR1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evR+BmHReQ5UMzDpD1QegmgPXk/OBBXW0322hYJkj7g=; b=vbH/v0CQd7/hA5p3wfA2jzhXJxcl4ONNQjynEwrTjm0/y08G4eUdh4kTpsHo0ifXP5fP6i arIIWn+kQbaPwu+hdMgyU4D7bgnhiqjDtRcJCLDJMPei3RcGahMv4a/3aXTZYIJG72EqmA bnlIyVX5SssUJl9YSVqjOm9ax8PJcv5NV/4aoUmfvFXh7Pl1BF8lR5owNdjZQCFDjPuFWD hr1Qfe53yDiRkX7/3O5Ndu/h6brKOCiE+rd6b3neVEAVgn+DNCl9tV5Jn1IW/IMno4mvBs gG2ceKV/kONxIZD8U4/crcssDJXg45oPeW1+9YbX33rrSOaPpZ/1dL4bFOqkZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925115; a=rsa-sha256; cv=none; b=e/dTdZ/w1epqcVpyQXcpT43YF+aW/wZD9ImOsJ/W+TPKFzLmipRKlZ43Q/cAY9v5Nn0JRi 85npvsKftrzWlmxjkQWsxq0qtCJxMnABhksCc4BrYEmqaeJkdW8vOQYCl4Rjr9/xWONiJw 4SsWsbLZwaHAFwY0vW+mnS68jcHWxQKOxiljXNG21+xfq5IARwgQ8XJcbv8CY/LWiAG9BR SK514E842jUc7rNvs97xTSikhkk9A5Kv1fZbv3hnqeMKGhoJ2LIjZQyai+2/QMWKsuu1YX k/pZDsq4Kbk72/PxNq/KEqeM44wBa1x6pAhQagZCc1bxwNQd65zeAc30XFb88g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZT72652z1BrF; Sun, 9 Jul 2023 17:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369HptGv096371; Sun, 9 Jul 2023 17:51:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HptjF096370; Sun, 9 Jul 2023 17:51:55 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:51:55 GMT Message-Id: <202307091751.369HptjF096370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: be01082b86ef - main - elf-hints.h: Allow rtld_paths.h to be included before it List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be01082b86ef06382177106dd43c39a048bb231f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=be01082b86ef06382177106dd43c39a048bb231f commit be01082b86ef06382177106dd43c39a048bb231f Author: Jessica Clarke AuthorDate: 2023-07-09 17:45:42 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:45:42 +0000 elf-hints.h: Allow rtld_paths.h to be included before it Currently rtld_paths.h will #undef _PATH_ELF_HINTS in order to override this to the right value if included afterwards, but the other way round does not work as elf-hints.h tries to define an already-defined macro to a potentially different value. Thus, guard the definition here so that rtld_paths.h's definition continues to take precedence. Note that, although all in-tree uses of _PATH_ELF_HINTS have included rtld_paths.h already, pax-utils wants _PATH_ELF_HINTS from elf-hints.h and so we cannot just drop the define. In-tree uses must just continue to make sure that they include rtld_paths.h to get the right value for libcompat builds as is already required. Reviewed by: kib, brooks, jhb, imp Differential Revision: https://reviews.freebsd.org/D40918 --- include/elf-hints.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/elf-hints.h b/include/elf-hints.h index e1ded3788a81..fa3bc407b1d1 100644 --- a/include/elf-hints.h +++ b/include/elf-hints.h @@ -47,6 +47,8 @@ struct elfhints_hdr { #define ELFHINTS_MAGIC 0x746e6845 +#ifndef _PATH_ELF_HINTS #define _PATH_ELF_HINTS "/var/run/ld-elf.so.hints" +#endif #endif /* !_ELF_HINTS_H_ */