From nobody Tue May 02 22:02:44 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 4Q9vFw3fB5z48Dbb; Tue, 2 May 2023 22:02:44 +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 4Q9vFw2plrz3HNk; Tue, 2 May 2023 22:02:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683064964; 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=izC/I80zna/RrNWiagEVS5TxbXgWLoqQdQmXIVo1cXc=; b=QRS+MIb++eX/d68kyMWqcGc/ALg+BI4oy9Kaol667ojhMXp9IlG/EX3QtAvWvnBJ9nln44 EhjJ5NloCEC5IyAgapPciURWIlAdY0Z9rOj1N0lgCHDVfnnUPT7YPYZVQMKcLm90MfDe3T vKlf38ZRg59B0THh5Wd3veso/OcfWbRnf7pfotG/IfhCtLdAL3em0iZcPaDhdrAFyYUA0k Rh/8a3hqRs4P69Z/bGD7dmJY8qBfUlWewIl9COxUPWTinWauR7IplRw1tOrcDlTTajC1D6 ysm6XJZLyj+9QSjnAHI7NKTWx74p4BN/hX64jKhJwK/R6Qvc5lKzM6lOdVVJag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683064964; 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=izC/I80zna/RrNWiagEVS5TxbXgWLoqQdQmXIVo1cXc=; b=KvymfM95V5pgWzQlNbTbxFow3qyjOJn0gkbFlFrDOGmZA6w9OA1Pu3LXy5aFGlgrtUQby5 z5ivtfY3iy0u4vPvjOlbu+mi7Iq75V+SVyH4weqU9teg7te+i8KQapvxHS4Ffgi9Y6DIri O4RRw2n4rjpibjRSuKOpOiA144MgFYHnmQkWNyq0kzWQzBI8x/nVUSz/PwY6yB7IYyN3FB bP1M09a1hbhTsBgntFC/vcTmrDy2+y1OGRiW0KfrSb55NfE3U8fZORD++yE7GAIxBjiWpF n9NUAtjQg5FFByOYVZ7I/YooN2Rqo3B7G47kJBTavV/FMKcar85m66/cglC1bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683064964; a=rsa-sha256; cv=none; b=ZuGPqAiK+SyL5WyUTVHJRMoXve2XdVFGrfei+s1EmYSvhrNtw+ZGvySMcts7XtCVPfmh51 g0+Q8wCdgK4Dst0GlaCgsSE/wOiyv44eFK0ZnGV9UbGs2uphetv6kmWbEDFnbChj+p1TAp p25SG6JFF6YOE0DUGaDzy0ko23PHtuxm60UltHLnlvKUW2NzyPmvdJqjiaDCOZqW8FJewL d0wO7h0NB+rOs+YQ5/snnGy6BOzjFXhuSISrKI2Fj2fAA3Ri30yHmKvlgLRtNazTWQfNug kyWBChO39htLMNrBYTGEwL54qjxS60SolwjQNCyyiruF5g3rqLP1Ajr6UniqMQ== 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 4Q9vFw1skBz14fs; Tue, 2 May 2023 22:02:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 342M2ieO040001; Tue, 2 May 2023 22:02:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 342M2ixQ040000; Tue, 2 May 2023 22:02:44 GMT (envelope-from git) Date: Tue, 2 May 2023 22:02:44 GMT Message-Id: <202305022202.342M2ixQ040000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ec1e83782d9d - main - rtld: don't add extraneous -L directory when MK_TOOLCHAIN == no 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec1e83782d9d13b427f7e935e9477e8120ec6c31 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ec1e83782d9d13b427f7e935e9477e8120ec6c31 commit ec1e83782d9d13b427f7e935e9477e8120ec6c31 Author: Ed Maste AuthorDate: 2023-05-02 19:57:20 +0000 Commit: Ed Maste CommitDate: 2023-05-02 22:01:43 +0000 rtld: don't add extraneous -L directory when MK_TOOLCHAIN == no rtld's Makefile used to add -L${LIBDIR} to LDFLAGS when MK_TOOLCHAIN was no. This was done as part of a change to fix building rtld with MK_TOOLCHAIN == no (although I'm not sure this part was necessary). In any case as of 5f2e84015da7 libc_pic.a is built independent of the MK_TOOLCHAIN setting and the main part of the workaround has already been removed. Remove the rest now. This reverts commit c0f5aeb0329d71e6b02379133c0c9c0145c9afea. Reviewed by: jrtc27 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39938 --- libexec/rtld-elf/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 1f3df176992a..a132c756723f 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -57,9 +57,6 @@ CFLAGS+= -fpic -DPIC $(DEBUG) LDFLAGS+= -shared -Wl,-Bsymbolic -Wl,-z,defs -nostdlib -e ${RTLD_ENTRY} # Pull in the dependencies that we use from libc .include "rtld-libc/Makefile.inc" -.if ${MK_TOOLCHAIN} == "no" -LDFLAGS+= -L${LIBCDIR} -.endif VERSION_DEF= ${LIBCSRCDIR}/Versions.def SYMBOL_MAPS= ${RTLD_ELF_DIR}/Symbol.map