From nobody Sun Jul 9 17:51:58 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 4QzZTC1lLmz4mW15; Sun, 9 Jul 2023 17:51:59 +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 4QzZTB593Pz3tVx; Sun, 9 Jul 2023 17:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925118; 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=op8CHgAFzeqi95d2KRALKtr1PZwBiVe1M7XzmwxRjks=; b=s7IeTlFNOIe7rwk8aybXJN/NIaQWcLZZQ3+6Qy37J9jNJHzEDBcOWywbDR2/FXfYle1vRU I87lK3+cA2Pae3l8lAhWoRmCa7JCTjsGEn2YQHLQO5pAIFTdTV4qDts/nxsxYCN0R+7TPg qzKcPIif2V4UOvvWV01iek1eJk7XBybMNGQHKfj/iOy+lXbNotaj3M1a38TGJyYlc5yhgV jd+MpiYt118dbfkALjR0w1jqC+fViouPaCFSELBa7uHsjS6I6cVAtX2n3g6Mj0LXF2wBK7 3/fu4Jd3OK3mYxi0oY2sAr9vMMj2i0av3oUnqN6N8Sai4gV9h3RlhMOaZS1zDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925118; 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=op8CHgAFzeqi95d2KRALKtr1PZwBiVe1M7XzmwxRjks=; b=bjQlK2XCJeNrBte3hZRtyodhzSdgZKrvxNItJagCUMKsw5yhs5gNX/YentfPfCNnvVGM0Q 9bqARZma+xaDvb1VattNkifwU7ks7l3T0N1A60WzJoYpLj5wZ1l3nwwUi5082jUrjQr+Tu G9eOYPW9qFg2vGNj6/Q53Vk0IB67NbHHaRXEU3vIfUiYG3Hqr2mHWX/AvIV7Zr45uV9JUT HfVkRA9SbkwvLwn3ZP9vuYuFXQa48UKfcSKqjOGjmePzDpkKSOK8LE6vJSwVdSyxC2aF2w +AEi1E20bmlf6MgzJkBY+iifatK3N6K9mmSVSjmOekzAcC8Y25/WtEkRHOrZhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925118; a=rsa-sha256; cv=none; b=bJ+wI6STuJZpZvc0sXHQpT3MEqKDqD/T9jgMv5eCFWaOfgcxRa+j72Ltbs5Exp9TID3mPf IR1bvcG4vIYlhgSpp79XefTCt+U1YE6ekqDpE44vg8AI74/7rgJVTCY6wSaBUXsP/3hP/m c4fRWA1gxTBNPRe87sFth1x1D7FbsOiU7y0nO/TkKHIHQLAXE59/PpB6Fn5EEcEBFyuiem aqaX/4B/n2AC5M2ye8qcxk8sIa9eTufcNKHgCeFD48CKApWcpBZ106sy0k4mz7KExeg3HV QfZJu8o1UozO80KHvUdHNHU7dUKd8CnDI6jE1GFFTJOzO8sAxmWqPvPwluz7sQ== 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 4QzZTB4GLCz1Bv2; Sun, 9 Jul 2023 17:51:58 +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 369HpwN0096438; Sun, 9 Jul 2023 17:51:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hpwcd096437; Sun, 9 Jul 2023 17:51:58 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:51:58 GMT Message-Id: <202307091751.369Hpwcd096437@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: 0fbb77c3ef8e - main - libc: Build all i386 sources for amd64 lib32 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: 0fbb77c3ef8eecb91caad8997a325a17c5fb374e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=0fbb77c3ef8eecb91caad8997a325a17c5fb374e commit 0fbb77c3ef8eecb91caad8997a325a17c5fb374e Author: Jessica Clarke AuthorDate: 2023-07-09 17:46:03 +0000 Commit: Jessica Clarke 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