Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Jul 2023 17:51:52 GMT
From:      Jessica Clarke <jrtc27@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 3d96c005dd29 - main - libsysdecode: Drop dead __amd64__ && COMPAT_32BIT code
Message-ID:  <202307091751.369HpqWH096326@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=3d96c005dd29543ad5d882bf68b2e357ad46636e

commit 3d96c005dd29543ad5d882bf68b2e357ad46636e
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-07-09 17:45:23 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
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 <i386/linux/linux.h>
 #elif __amd64__
-#ifdef COMPAT_32BIT
-#include <amd64/linux32/linux.h>
-#else
 #include <amd64/linux/linux.h>
-#endif
 #else
 #error "Unsupported Linux arch"
 #endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307091751.369HpqWH096326>