From nobody Thu Jan 23 09:52:02 2025 X-Original-To: dev-commits-src-all@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 4Ydx770wzwz5lvl4; Thu, 23 Jan 2025 09:52:03 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ydx766M9cz3rxY; Thu, 23 Jan 2025 09:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737625922; 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=7Y5i07r8Vn0Gbp4JfkPwF15rprcRuwytp24F9fQuJWg=; b=q93IYBn8AjJkZUOe+glZ6vnfjcv2JCulbzl/+bwfA+7e24sfUZsquCVHlSPKC6S4s4gmdt jIURB2DBdu9tySFZ6V1UDbDJvxtaZnilsPnATg4d0gXQMJinvZyEdBTxxwGR3znM958pW3 7Pu3cvW74Irg5IWosJbeAX09aKXD3hnSOuzAzKwve+zcutA0nJQ5v4qOKp2l61cN0qMZms hohcc6fF5bzkZ+MWPhBFSbskk9rPRaJ25rhHJOSLuzqFUksybL3x+34lLigBgrELOD8U3m bGuhZCc9NOCkn5NDdHpVK0e3CcYeLVTH1Yuv8x5nEL+SFg3vx2ALoHIOYyLJvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737625922; 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=7Y5i07r8Vn0Gbp4JfkPwF15rprcRuwytp24F9fQuJWg=; b=PxSBTeu05Qs1PXQsz0ryRXtCP6ksrL62B8fO05OLotHudg7Q/hwHcMXXRnGt8xB1lGRYNu 64kSJipBltrtF/Sy3nS2T4zAc5LH4htiSruxqFM0T0p2T7UED/wDyfDoz/2TQ+SVcdEQpH DKCEN3ouNIEEiwvNN9ltW/Tcxjgl62m8SV42CGr9RpD4m5yq3BYoH7ZhUKPfJLG2EoYypD sZyCkL/r2M91gEC2SW7zSCa1MMK5Aep7qjOfxYSiLOqcc2fhz0843fjWfDCF2Fv2eWfsCV t7yYhujt7H9tnShKGAw257NznGHcxw7Q3no0d52yIA7eX4+wbbGM52g/COKYEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737625922; a=rsa-sha256; cv=none; b=tmG45GWpgtHLV+27e5VCjWO6dOITI9S9S133ugWjtkLFsAfqQZ2WInmhCELBTmS7sTDxHS +6wGoZL4v4Y4hGiMuVpUBJxukW+nxRGmI9xqYYZ0xIv+PQkJraxvfpl76mGfoXwtKRg4qS 2usn9LBXi62oAfgnCrfUOHOJPaaO0cxG4Ul2C5u92s2lwjaBE1gWxUBmXNt7kntP7boNa9 PbdynUFl5dLfBU13MhhDn4D5XQrkpo71m8FjbjCtixwvgHo3Yyj72Hp1dUnmwIqDe35NId 0ZBXKqcOpiTYLoYGWFv9LYEl20o+H5D6HHBWj/9Zexiyv/WWcxX9ZBG+39NdKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ydx765tQYzZg1; Thu, 23 Jan 2025 09:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50N9q2KZ073470; Thu, 23 Jan 2025 09:52:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50N9q2Xc073467; Thu, 23 Jan 2025 09:52:02 GMT (envelope-from git) Date: Thu, 23 Jan 2025 09:52:02 GMT Message-Id: <202501230952.50N9q2Xc073467@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f10a06556f56 - stable/14 - rtld-elf/{amd64,i386}/reloc.c: remove unneeded #ifdef dbg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f10a06556f56ddbcf348a7b1e67a8e89b71c739d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f10a06556f56ddbcf348a7b1e67a8e89b71c739d commit f10a06556f56ddbcf348a7b1e67a8e89b71c739d Author: Konstantin Belousov AuthorDate: 2025-01-18 03:07:15 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-23 09:46:58 +0000 rtld-elf/{amd64,i386}/reloc.c: remove unneeded #ifdef dbg (cherry picked from commit e3035c52f25356299abc8e08be9221032967554d) --- libexec/rtld-elf/amd64/reloc.c | 2 -- libexec/rtld-elf/i386/reloc.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c index 9c5887def356..7e7f01a5d186 100644 --- a/libexec/rtld-elf/amd64/reloc.c +++ b/libexec/rtld-elf/amd64/reloc.c @@ -405,9 +405,7 @@ reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const struct Struct_Obj_Entry *refobj __unused, const Elf_Rel *rel __unused) { -#ifdef dbg dbg("reloc_jmpslot: *%p = %p", where, (void *)target); -#endif if (!ld_bind_not) *where = target; return (target); diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c index 04a8354343bc..361bb777315a 100644 --- a/libexec/rtld-elf/i386/reloc.c +++ b/libexec/rtld-elf/i386/reloc.c @@ -358,9 +358,7 @@ reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const Obj_Entry *obj __unused, const Obj_Entry *refobj __unused, const Elf_Rel *rel __unused) { -#ifdef dbg dbg("reloc_jmpslot: *%p = %p", where, (void *)target); -#endif if (!ld_bind_not) *where = target; return (target);