Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Jul 2023 17:51:58 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: 0fbb77c3ef8e - main - libc: Build all i386 sources for amd64 lib32
Message-ID:  <202307091751.369Hpwcd096437@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=0fbb77c3ef8eecb91caad8997a325a17c5fb374e

commit 0fbb77c3ef8eecb91caad8997a325a17c5fb374e
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-07-09 17:46:03 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-07-09 17:46:03 +0000

    libc: Build all i386 sources for amd64 lib32
    
    Having the symbols exported by libc differ between i386 and amd64 lib32
    is questionable. Since these files build just fine today, stop guarding
    them with !defined(COMPAT_32BIT). Whether or not they work at run time
    is a different matter, but an i386 jail would be similarly affected if
    not, so that's not a problem with lib32.
    
    Reviewed by:    kib, jhb, imp
    Differential Revision:  https://reviews.freebsd.org/D40937
---
 lib/libc/i386/sys/Makefile.inc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc
index cf5d390ca094..f2f4bae24648 100644
--- a/lib/libc/i386/sys/Makefile.inc
+++ b/lib/libc/i386/sys/Makefile.inc
@@ -1,11 +1,9 @@
 #	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
 # $FreeBSD$
 
-.if !defined(COMPAT_32BIT)
-SRCS+=	i386_clr_watch.c i386_set_watch.c i386_vm86.c
-.endif
 SRCS+=	i386_get_fsbase.c i386_get_gsbase.c i386_get_ioperm.c i386_get_ldt.c \
-	i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c
+	i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c \
+	i386_clr_watch.c i386_set_watch.c i386_vm86.c
 
 MDASM=	Ovfork.S cerror.S getcontext.S syscall.S
 



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