From nobody Fri Apr 19 21:25:14 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 4VLnjk2pDLz5HmTq; Fri, 19 Apr 2024 21:25:14 +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 4VLnjk245Yz45ZV; Fri, 19 Apr 2024 21:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713561914; 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=fen/UPLQMYGNyhBIruar8AEKroU975rmcpsryhyLjlE=; b=v74JqHmLopsb7hzTeC+qwL1NwfqyfrHszIsqxnW21ulpRPSPYKsEQHJXG/qteXZ9JgU/hJ kmc1LH0uaM/pMzPpe9TxArZA7Sq5lypKeNn6LTakJ0qPSqwfcpgsTKesrXOiNNIh09NLZ7 0szMBbWqu1i7n4TfLhOVFTuJIbnlvvNTqJTb5P2EB4LEgj6WxbLzb5Vcj/C/ZMl6p3KBW3 kcSGRKEvzl8OGG2cd5aMzvhFgFyil9wKhPROR5q452Vjn2Khfvxb3rzGAfdUJw+x3eyuVT zVWpvYMD7ww02OoKcB9h3pyUfyzABdOoHESRheMJz23Skh6o+sjfLKGPjTN1FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713561914; a=rsa-sha256; cv=none; b=HqHxIMSDwhClLdQHr7IKNEGz0FJNxlMSmhxTbV0Cu84OCvXN+Xsfq813yDdv51FYlmgc7f FlitSIKh2NSfYT/3cfHEHlHTVo+483zMuR7i1lQtouBFDW0x6/WON3eUNtPgMVhdvOv+uC J1paiQmoy2NaRnA8Jel+nHJsiYuRFa5iYawd5ugkM4I3Pb/0Sn9xCHYnPV18nCQ5Heqdxg yZCNLr+NAHW3Qsgq7xIM2yYYQbw8hxqBdW4JdY4DcbnXXZJgFKJ/nYZOQBvloX/8o1IXGu l6KTCQH3Hj/oufVOZqBK+x5gxnSZp2l4O2nHoxDF+j58cdNemTGispaIQ7VvfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713561914; 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=fen/UPLQMYGNyhBIruar8AEKroU975rmcpsryhyLjlE=; b=qviYTbFnk2UXxrus58dW20Q3nv8osM4KU8xKfjsZRuEOazsbY1xFf27bdhrm8Tyqdfsdzt 8/LBVbufT0kvQ+NQh+0kOluPi6WXIPk1o2EiJT0J8vB7ARvc1fgsvf/rZO7QElzZCYxOAh eC8d95aa9hnCJ5R5g3ML5/eePZeBxRzXgqnXcL65WtVYgbKJUfZZPprgJngNT+OKMP3tH6 8IxGAQ5YJisL9m2Gi9Kz+awwTaJVU1Lnh8AsB/X3/Px7tNbVkshHbFc6kXfAVLLqey5c0p JpDv3c3LStpAxNy9IitV6/wCJviIbi+drDmgneC+q4CxSrIxZhNOIULNIuBfxw== 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 4VLnjk1fvvz18KK; Fri, 19 Apr 2024 21:25:14 +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 43JLPEwL073861; Fri, 19 Apr 2024 21:25:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43JLPEie073858; Fri, 19 Apr 2024 21:25:14 GMT (envelope-from git) Date: Fri, 19 Apr 2024 21:25:14 GMT Message-Id: <202404192125.43JLPEie073858@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: 6e83504c6031 - main - Revert "lib{c,sys}: normalize export of openat, setcontext, and swapcontext" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 6e83504c603157e9fc1660d2a1556036492662fc Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6e83504c603157e9fc1660d2a1556036492662fc commit 6e83504c603157e9fc1660d2a1556036492662fc Author: Brooks Davis AuthorDate: 2024-04-19 21:21:46 +0000 Commit: Brooks Davis CommitDate: 2024-04-19 21:25:04 +0000 Revert "lib{c,sys}: normalize export of openat, setcontext, and swapcontext" I put the symbols in the wrong file (should have been lib/libc/sys/Symbol.map), added a duplicate pdfork entry due to a botch rebase, and there seems to be a issue with gcc13/binutils not exposing the symbols so revert the whole thing while I debug. This reverts commit ee632fb9eb4a060a4087a7f5425bfe36e65cda61. --- lib/libc/sys/openat.c | 1 + lib/libc/sys/setcontext.c | 1 + lib/libc/sys/swapcontext.c | 1 + lib/libsys/Symbol.sys.map | 4 ---- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/libc/sys/openat.c b/lib/libc/sys/openat.c index 389360a5a9f5..1cd8e7d90745 100644 --- a/lib/libc/sys/openat.c +++ b/lib/libc/sys/openat.c @@ -37,6 +37,7 @@ __weak_reference(__sys_openat, __openat); __sym_compat(openat, __impl_openat, FBSD_1.1); __weak_reference(openat, __impl_openat); +__sym_default(openat, openat, FBSD_1.2); #pragma weak openat int diff --git a/lib/libc/sys/setcontext.c b/lib/libc/sys/setcontext.c index 301cca84c4f9..96b5dc115067 100644 --- a/lib/libc/sys/setcontext.c +++ b/lib/libc/sys/setcontext.c @@ -36,6 +36,7 @@ __weak_reference(__sys_setcontext, __setcontext); __sym_compat(setcontext, __impl_setcontext, FBSD_1.0); __weak_reference(setcontext, __impl_setcontext); +__sym_default(setcontext, setcontext, FBSD_1.2); #pragma weak setcontext int diff --git a/lib/libc/sys/swapcontext.c b/lib/libc/sys/swapcontext.c index 42793a516c70..b69a5b19e698 100644 --- a/lib/libc/sys/swapcontext.c +++ b/lib/libc/sys/swapcontext.c @@ -38,6 +38,7 @@ __weak_reference(__sys_swapcontext, __swapcontext); __sym_compat(swapcontext, __impl_swapcontext, FBSD_1.0); __weak_reference(swapcontext, __impl_swapcontext); +__sym_default(swapcontext, swapcontext, FBSD_1.2); #pragma weak swapcontext int diff --git a/lib/libsys/Symbol.sys.map b/lib/libsys/Symbol.sys.map index 359570c413a4..822c007d32f1 100644 --- a/lib/libsys/Symbol.sys.map +++ b/lib/libsys/Symbol.sys.map @@ -301,8 +301,6 @@ FBSD_1.2 { cap_getmode; getloginclass; getpagesizes; - openat; - pdfork; pdgetpid; pdkill; posix_fallocate; @@ -311,9 +309,7 @@ FBSD_1.2 { rctl_get_limits; rctl_add_rule; rctl_remove_rule; - setcontext; setloginclass; - swapcontext; }; FBSD_1.3 {