From nobody Mon Feb 05 20:38:37 2024 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 4TTJB615Z1z58y2D; Mon, 5 Feb 2024 20:38:38 +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 4TTJB55G84z4pw4; Mon, 5 Feb 2024 20:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707165517; 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=8Er7gKOqSRAtGFFJFURPXKCbnjHKYWDI/WLOcpWs0f0=; b=LExM08fPhbKIWUt9OLjzj7IF1iT9xEikNIqD0s6Cg4eg7cg2RVYa7bMDTkZ/22RKvd4BP6 97HBUybLk6PZzZ7TPZNXr6m9dMKPP9XPBWOFV3uQShKXixMjDyU2Po0RE89sU7gL30j+DG Cq6971hVfeybXJckNln9/t5e+heHfEnZlfdKBkusgYGlLpbhlM9AfV/ugeJOjBvuiqlpnm CRyjqn14nwYx5LV64YTJVV2B47vZhuDSzfnBrCIfsQoQGBRyuMoAf3IYeLOWRcjhpElduf K2V1+ivEWHphDb6lFsPOP0XF7hCxpDuluc/Hps0AUtFRyiTOdZf+Tf+Nem2eFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707165517; 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=8Er7gKOqSRAtGFFJFURPXKCbnjHKYWDI/WLOcpWs0f0=; b=XSS6L6kLgnbLpuUy0R9N1YfkeSz3lbNlQYEhC08MLX8amJ56jLqBD7DtAacOit/1NOsZYB bfsZL/RBtn1HS/33w8aPI4EwqqATtQ1/SKZ9zsWS5+kLl4wl4OLbS9sf7sNbP0pefRgiHA ovnVJC6zGJJacfMlTGZrqSI4+Hcx1kppNFd0ezm0wysUm4EiYDAXwzFfGCbnuX2btEZh/P 7S/5Wvy00tTJ8uzfL57hgj7bTLGJ1vUpBIIvugLihnb3zWiJaHr5QtXQsmGbFXOiqXMo6W ZMhRn+u3Fofb7RmuMocWagButU/+cZmxVbIhmeEZFXyBv1osexDSwa8dqEv6Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707165517; a=rsa-sha256; cv=none; b=Wg7nYxIFtoh1qZhoNyhwMWknyR3eS8Lmj2wFXJSLs1AKFLJgKq4RPK2vVRewwHE/X4UyRq yqo+UlIxdy9JmvJqM1w4mRzFUhm7pVoT4SHXaaUbq2Jb6UcQtO2A7cT5B5nOYFE5InZCko /G1m7zjALFJ4rsMpHJT9C4xdsPvGcORNvZDT2KikS07pkd8v5evSWbBXzwmFY+7hK7hIxy 6jooQN4J+24hMtfEES6gc0z4SKtso5YykSsUl1bvJFYEVEeviypVj2pmmMxmLAPqICxwRq WpctyUys+Iam1VOksa8i3fO014a80ZQgsePA/bSPUDKfHXSvnjDt7FGrjjHDrA== 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 4TTJB54MpbzvJk; Mon, 5 Feb 2024 20:38:37 +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 415Kcb7b069356; Mon, 5 Feb 2024 20:38:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 415KcbwB069353; Mon, 5 Feb 2024 20:38:37 GMT (envelope-from git) Date: Mon, 5 Feb 2024 20:38:37 GMT Message-Id: <202402052038.415KcbwB069353@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 81245a77f0a3 - main - libc: compile _once in libsys 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81245a77f0a34f80f8097ed461d785a9074855e3 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=81245a77f0a34f80f8097ed461d785a9074855e3 commit 81245a77f0a34f80f8097ed461d785a9074855e3 Author: Brooks Davis AuthorDate: 2023-11-21 18:30:43 +0000 Commit: Brooks Davis CommitDate: 2024-02-05 20:34:56 +0000 libc: compile _once in libsys auxv support requires _once(), but we don't want the libsys version stomping on the libc version should they diverge in the future. We could rename it entierly, but for now just hook it in via Makefile.sys. Reviewed by: kib, emaste, imp Pull Request: https://github.com/freebsd/freebsd-src/pull/908 --- lib/libc/gen/Makefile.inc | 1 - lib/libsys/Makefile.sys | 1 + lib/{libc/gen => libsys}/_once_stub.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 9eeab36f7d00..ae5a12d8b668 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -9,7 +9,6 @@ CONFSPACKAGE= runtime SRCS+= __getosreldate.c \ __pthread_mutex_init_calloc_cb_stub.c \ __xuname.c \ - _once_stub.c \ _pthread_stubs.c \ _rand48.c \ _spinlock_stub.c \ diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index e31a30d731bb..ef800e4d2445 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -32,6 +32,7 @@ PSEUDO+= _clock_gettime.o _gettimeofday.o # Sources common to both syscall interfaces: SRCS+= \ __error.c \ + _once_stub.c \ interposing_table.c SRCS+= getdents.c lstat.c mknod.c stat.c diff --git a/lib/libc/gen/_once_stub.c b/lib/libsys/_once_stub.c similarity index 100% rename from lib/libc/gen/_once_stub.c rename to lib/libsys/_once_stub.c