From nobody Wed Jan 25 16:05:54 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 4P27x11G29z3bnvk for ; Wed, 25 Jan 2023 16:05:57 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P27x05s9Rz4M5S for ; Wed, 25 Jan 2023 16:05:56 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f50.google.com with SMTP id l41-20020a05600c1d2900b003daf986faaeso1653489wms.3 for ; Wed, 25 Jan 2023 08:05:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c4QCEVKqU6xy/Vy0BEj1ze4l3jQUxUCorNHljfUzU/0=; b=WWdmLzKuvQ5ntaejUQICOaeVhGO12x7W4/i+ItRfPdnfLUDPyGMWM3fHAgDLGSQwBY AwyWqtUJJyGt/tgtGshsqMSeNPGsAsN14zQTWp+UqqWrvo4SqxmHUrWhcMYIf2/02Jq9 0BvOXVta4PBiTGZhzOJZD54tWXhBaZQK/UGACILJpQwHTTts5FVJwQAPH5Y5lP1jGn7g z23HitudbE6a7W9VFs7Lk/rEBcbob7PI5PJdq5mod2O2RAvAE7qrdbvgF7b2fdNHe44f FTwuZ75Q11dx8J3QMoQXuAiNoGoTWEmtB+Nf2xU1aMqM6gnQdOb1FXZShdwXWvNaudJx 76aA== X-Gm-Message-State: AFqh2kp0DW+6eE0rBqxGRUsitaHHuNQIKfVTgHtI/ZJaCO0JZBpmgFfR CnXPTJNeXABX1ptcMHtXWoI+9g== X-Google-Smtp-Source: AMrXdXveUMBXL+sPdJgXbmgK7rOl1eIEg6YK8y2LSG20stKDzXjAUpjlgarOvNlAKWX0jbLedpY9og== X-Received: by 2002:a05:600c:a29e:b0:3d9:ee01:ae5b with SMTP id hu30-20020a05600ca29e00b003d9ee01ae5bmr31972323wmb.12.1674662755079; Wed, 25 Jan 2023 08:05:55 -0800 (PST) Received: from smtpclient.apple (global-5-143.n-2.net.cam.ac.uk. [131.111.5.143]) by smtp.gmail.com with ESMTPSA id hu10-20020a05600ca28a00b003d9f14e9085sm2181029wmb.17.2023.01.25.08.05.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jan 2023 08:05:54 -0800 (PST) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: git: 783c318fd118 - main - zoneinfo: On amd64, include 32-bit data. From: Jessica Clarke In-Reply-To: <202301251555.30PFtxeh015569@gitrepo.freebsd.org> Date: Wed, 25 Jan 2023 16:05:54 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202301251555.30PFtxeh015569@gitrepo.freebsd.org> To: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Rspamd-Queue-Id: 4P27x05s9Rz4M5S X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 25 Jan 2023, at 15:55, Dag-Erling Sm=C3=B8rgrav = wrote: >=20 > The branch main has been updated by des: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D783c318fd1181d46554c31a5039db10e= 7f5eef49 >=20 > commit 783c318fd1181d46554c31a5039db10e7f5eef49 > Author: Dag-Erling Sm=C3=B8rgrav > AuthorDate: 2023-01-25 15:54:52 +0000 > Commit: Dag-Erling Sm=C3=B8rgrav > CommitDate: 2023-01-25 15:54:52 +0000 >=20 > zoneinfo: On amd64, include 32-bit data. >=20 > While there, drop the unnecessary posixrules option. I=E2=80=99m not sure how this makes sense. Isn=E2=80=99t the file format = entirely MI? There=E2=80=99s nothing in zic that knows what TARGET_ARCH is when = building the bootstrap tool, the only thing it could possibly look at is MACHINE_ARCH for the bootstrap tool, but that would tell you about the build machine not the target machine. So why does cross-compiling i386 on amd64 work but lib32 from a native amd64 build doesn=E2=80=99t? Jess > Sponsored by: Klara, Inc. > Reviewed by: imp, allanjude > Differential Revision: https://reviews.freebsd.org/D38142 > --- > share/zoneinfo/Makefile | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) >=20 > diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile > index dfe148544bd6..cffd12cc5e9a 100644 > --- a/share/zoneinfo/Makefile > +++ b/share/zoneinfo/Makefile > @@ -51,7 +51,6 @@ LEAPFILE=3D > TZFILES=3D africa antarctica asia australasia etcetera europe \ > factory northamerica southamerica > TZFILES+=3D backward > -POSIXRULES=3D America/New_York >=20 > TZFILES:=3D ${TZFILES:S/^/${CONTRIBDIR}/} >=20 > @@ -78,11 +77,17 @@ all: zoneinfo > .endif > META_TARGETS+=3D zoneinfo install-zoneinfo >=20 > +# On amd64, include 32-bit data for compatibility with = statically-linked > +# i386 binaries which still use a 32-bit time_t. > +.if ${MACHINE_ARCH} =3D=3D "amd64" > +ZICFLAGS+=3D -b fat > +.endif > + > zoneinfo: ${TDATA} > mkdir -p ${TZBUILDDIR} > cd ${TZBUILDDIR}; mkdir -p ${TZBUILDSUBDIRS} > umask 022; cd ${.CURDIR}; \ > - zic -D -d ${TZBUILDDIR} -p ${POSIXRULES} -m ${NOBINMODE} \ > + zic -D -d ${TZBUILDDIR} ${ZICFLAGS} -m ${NOBINMODE} \ > ${LEAPFILE} ${TZFILES} >=20 > #