From nobody Sun Jul 09 17:51:52 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 4QzZT51gNtz4mVg4; Sun, 9 Jul 2023 17:51:53 +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 4QzZT517TGz3t6M; Sun, 9 Jul 2023 17:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925113; 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=V0dCDHhzjNoQwDC57scgcYKXTub8GV/XxwKphmrxzkM=; b=cGckJLZ6FPfcwmFnpPkLYXZDQ2mE7wHtxw+waZ15FQmsWkfA73JklKTP5uBH+1pUR6X7UO 9jAk2F4rngJp6TltbeymYMz35u1ayVld7OC9jBuKgWLLxRPHkY/HKiIGER7CDsP5hObnRK 9ASmjUbidWnbaWruC76sW5aiy2ulmou7tmupMYdluY6pZ2FldNCJLAY/VjjNgaOh+TyUp7 leCFk/Sn/O7uq7hnT4F9fMabJm3Nq7X/uLtTh6ELyckR9DR0Y/VE/oGQQluAtjoCVDvOlc U1QWcAGOYQuTSheXv02onmWTz6VHacZueIjKpO8OHqoA4/7r0S54YgU9gdhIEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925113; 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=V0dCDHhzjNoQwDC57scgcYKXTub8GV/XxwKphmrxzkM=; b=RPWlV3hhsGkwTDdYv3fwvzmq0S90tHZ4sDgHY3Bmugb2P54t3+r42UgItw4OyoRIts8W6B ATsThqKTJh+2kcO1v8JXCs1srsynp1ZECI/8edWzYQ22P4mYmFv3vW/rH4/cRm23Vln8Rv RxG3w5ey3P1LkGen/hwK0wdF4+2R98rdswdp+REWwe40ZWEgmsJMb9VX4Bw8QXRS7pS1Zh 1ERawoAfcTVzHM/7mgQiCXOhiRrZeu6IR9wT5AB0EYUaedckC0ki662cIjW92/hZHIjQqO tg6bs7VqIXilrjHbqV2PZAp27vYfMjfbghZP+TEdwnRdkzugFh4q910xB5oyNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925113; a=rsa-sha256; cv=none; b=yz6UzuhxVpj8JSwCFivaomiEuhCzfl4Eb0Qn319accc8LK4p9CRRLIrFFl3GRbgOu23m98 p3+Z4yPgNrjsU8otof/xNRWd+jkNBetMiB8m+N3Bm32ojHEDLQMryTN59Iuc6RIQM7NvhD RjACWxRQnazi8cW/tXJ484asCSimjFvKksxPPLkZ9fET5I9GbcwjCQsAOXYSN1Zn46nSKa /Z3vur52/N4jdQ5fYHFeU7KkEo5n90PNIFsXU7O6NHuF6z5VGLUX31DIt8mU5VHwFZ5ZAo czUxfk1koVALqJm/4swmD38P25tgjj+OOIqz3Xe1q05RpP1+UBnc5cSbFx6+Gw== 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 4QzZT50F3Bz1Bys; Sun, 9 Jul 2023 17:51:53 +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 369HpqEk096327; Sun, 9 Jul 2023 17:51:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HpqWH096326; Sun, 9 Jul 2023 17:51:52 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:51:52 GMT Message-Id: <202307091751.369HpqWH096326@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: 3d96c005dd29 - main - libsysdecode: Drop dead __amd64__ && COMPAT_32BIT code 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: 3d96c005dd29543ad5d882bf68b2e357ad46636e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3d96c005dd29543ad5d882bf68b2e357ad46636e commit 3d96c005dd29543ad5d882bf68b2e357ad46636e Author: Jessica Clarke AuthorDate: 2023-07-09 17:45:23 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:45:23 +0000 libsysdecode: Drop dead __amd64__ && COMPAT_32BIT code Under COMPAT_32BIT we are compiling 32-bit code and so __amd64__ is not defined, __i386__ is, and we use the real i386 headers. Reviewed by: brooks, jhb, imp Differential Revision: https://reviews.freebsd.org/D40916 --- lib/libsysdecode/linux.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/libsysdecode/linux.c b/lib/libsysdecode/linux.c index 44de91ef66cb..4a0c8a602728 100644 --- a/lib/libsysdecode/linux.c +++ b/lib/libsysdecode/linux.c @@ -41,11 +41,7 @@ __FBSDID("$FreeBSD$"); #elif __i386__ #include #elif __amd64__ -#ifdef COMPAT_32BIT -#include -#else #include -#endif #else #error "Unsupported Linux arch" #endif