From nobody Sat Mar 12 16:37:17 2022 X-Original-To: dev-commits-src-all@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 C2BB61A0ED42; Sat, 12 Mar 2022 16:37:21 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) (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 4KG7kS4tFLz4bqR; Sat, 12 Mar 2022 16:37:20 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-lj1-x235.google.com with SMTP id q5so16099562ljb.11; Sat, 12 Mar 2022 08:37:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=9+9iSNneKcyIdKH5D9/EWikwN2Dg+LG7dWpBDf4+GT8=; b=PAFC4frJlI5bgf8dB+8e3+/bbJ8GGO51F6vHJ1x8Y0jp2mbrgbreXi/mTP+7UZ63yS 9jTrW4D2oMp4NSXfDWVYjrLtHwiitBd0WjOmdqs5pTAExYA5zhNUEtPYzWF5HNrzAyZX TsS4AjCczuuGsahHmdgEJioDDZnyZbGVbS5qFSqwwMn+wpVKY5rl6BbALnYEf/0xa3JX kCgp8Tnaq2G0NTFFGcWo40LX2Zm/YNJAVB/h+paGLnwCqe3jxV9qBBYB+bDB8oL2FJXw 5m7jg7gZtCr7r6F8wbKJczqCaHCCrUh1VxcV7Y5OMGe4WBAcPs4ugRIy6QKwq2OWtGCy 8Bgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=9+9iSNneKcyIdKH5D9/EWikwN2Dg+LG7dWpBDf4+GT8=; b=FwAUg3qkJJXe+NSaPTPmjgkrl65vLOa1/0DUTFb6PZBLbWDSJkjtFaSjjhIHrdnLDr ocmeB3UoSPQvwx92nZgQq/Is/GcU4/r77a22B4S+GlqOjcXaSLQbAnuPNI5a3+51nngq eQaDD4Xc+umkntmBYjSI3VBjiI+vXLoMogdMNA6aR79lj5d7CL48SORKB4YBwHV7g84f ZS/t3fLXwpBlvSPpTE0Y6HYKXl4lGnGbD0Cx6vR+q0yg2dW1vswilEnuKheyjiSXyJPy /MtRgTdtT1tJMJ9RSnFMg6XNGllDK+NLIfmlm5hFFWsfF1yYooWqzRbFTi5dcCeF94yc tXmQ== X-Gm-Message-State: AOAM530AKyTbuIdo1kjSWO7bW8CXizhVKeF7IFqdwoOd7r044pnLWZvF 3NlxWGbIUYNJLEiEKVXJ8Wok86AiALiwgUzX2YT6wr2Z X-Google-Smtp-Source: ABdhPJwXpy8+JC3FEv91SrjOYclKSFiQ2stMFR9yonoc2z+JaQCZuoB7UrmKK1TBNAxSYGopc+ZCLbVRputFylhnFqg= X-Received: by 2002:a2e:9654:0:b0:244:bb3f:6555 with SMTP id z20-20020a2e9654000000b00244bb3f6555mr9279937ljh.282.1647103037950; Sat, 12 Mar 2022 08:37:17 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Received: by 2002:aa6:cb4f:0:b0:1a3:8d4b:4aec with HTTP; Sat, 12 Mar 2022 08:37:17 -0800 (PST) In-Reply-To: References: <202203121459.22CExLoW093599@gitrepo.freebsd.org> From: Mateusz Guzik Date: Sat, 12 Mar 2022 17:37:17 +0100 Message-ID: Subject: Re: git: 5fc3cc2713ef - main - amd64: make bcmp in libc just call memcmp To: Kyle Evans Cc: src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4KG7kS4tFLz4bqR X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=PAFC4frJ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of mjguzik@gmail.com designates 2a00:1450:4864:20::235 as permitted sender) smtp.mailfrom=mjguzik@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEMAIL_FROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; NEURAL_HAM_LONG(-1.00)[-1.000]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::235:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-ThisMailContainsUnwantedMimeParts: N On 3/12/22, Kyle Evans wrote: > On Sat, Mar 12, 2022 at 8:59 AM Mateusz Guzik wrote: >> >> The branch main has been updated by mjg: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=5fc3cc2713eff8cdabbf6e5d03bf8a799adf808c >> >> commit 5fc3cc2713eff8cdabbf6e5d03bf8a799adf808c >> Author: Mateusz Guzik >> AuthorDate: 2022-03-12 12:27:25 +0000 >> Commit: Mateusz Guzik >> CommitDate: 2022-03-12 14:59:14 +0000 >> >> amd64: make bcmp in libc just call memcmp >> >> Preferably bcmp would just alias memcmp but there is build magic >> which >> makes this problematic. >> >> Reviewed by: jhb >> Differential Revision: https://reviews.freebsd.org/D28846 >> --- >> lib/libc/amd64/string/Makefile.inc | 1 - >> lib/libc/amd64/string/bcmp.c | 16 ++++++++++++++++ >> 2 files changed, 16 insertions(+), 1 deletion(-) >> >> diff --git a/lib/libc/amd64/string/Makefile.inc >> b/lib/libc/amd64/string/Makefile.inc >> index cb370bc6be1c..b77079afc933 100644 >> --- a/lib/libc/amd64/string/Makefile.inc >> +++ b/lib/libc/amd64/string/Makefile.inc >> @@ -1,7 +1,6 @@ >> # $FreeBSD$ >> >> MDSRCS+= \ >> - bcmp.S \ >> memcmp.S \ >> memcpy.S \ >> memmove.S \ > > We should probably add a tools/build/depend-cleanup.sh entry for this, > so that non-clean builds pick up the new object, but > >> diff --git a/lib/libc/amd64/string/bcmp.c b/lib/libc/amd64/string/bcmp.c >> new file mode 100644 >> index 000000000000..b45176dc2d56 >> --- /dev/null >> +++ b/lib/libc/amd64/string/bcmp.c >> @@ -0,0 +1,16 @@ >> +/*- >> + * Written by Mateusz Guzik >> + * Public domain. >> + */ >> + >> +#include >> +__FBSDID("$FreeBSD$"); >> + >> +#include >> + >> +int >> +bcmp(const void *b1, const void *b2, size_t len) >> +{ >> + >> + return (memcmp(b1, b2, len)); >> +} > > Why do this instead of replacing the previous contents of bcmp.S with > either: > > #define memcmp bcmp > #include "memcmp.S" > > or, restructure memcmp like you did with memcpy/memmove? > I wanted to get rid of another instance where a routine is copied. The real fix would turn bcmp into a straight up alias to memcmp, but I gave up on the libc build process. -- Mateusz Guzik