From owner-freebsd-stable Sat Aug 31 17:57:13 2002 Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B88237B400 for ; Sat, 31 Aug 2002 17:57:08 -0700 (PDT) Received: from creme-brulee.marcuscom.com (rdu57-17-158.nc.rr.com [66.57.17.158]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DD2843E65 for ; Sat, 31 Aug 2002 17:57:07 -0700 (PDT) (envelope-from marcus@marcuscom.com) Received: from shumai.marcuscom.com (shumai.marcuscom.com [192.168.1.4]) by creme-brulee.marcuscom.com (8.12.5/8.12.5) with ESMTP id g810tdix029458; Sat, 31 Aug 2002 20:55:39 -0400 (EDT) (envelope-from marcus@marcuscom.com) Subject: Re: something broke libc_r From: Joe Marcus Clarke To: Glenn Johnson Cc: stable@FreeBSD.ORG In-Reply-To: <20020901003020.GA1726@gforce.johnson.home> References: <20020901003020.GA1726@gforce.johnson.home> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-49Jfm++zTzIT3k0n3zYU" X-Mailer: Ximian Evolution 1.0.8 Date: 31 Aug 2002 20:57:27 -0400 Message-Id: <1030841847.88942.37.camel@shumai.marcuscom.com> Mime-Version: 1.0 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --=-49Jfm++zTzIT3k0n3zYU Content-Type: multipart/mixed; boundary="=-8t1Lr39cfbA+4+EI2E5F" --=-8t1Lr39cfbA+4+EI2E5F Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Sat, 2002-08-31 at 20:30, Glenn Johnson wrote: > Everything linked with libc_r is failing with the following error: >=20 > /usr/libexec/ld-elf.so.1: /usr/lib/libc_r.so.4: Undefined symbol "_thread= _fd_getflags" >=20 > I just did a cvsup and rebuilt world and kernel at about 7:00 PM CST. >=20 > Here is the output of uname: >=20 > FreeBSD gforce.johnson.home 4.6-STABLE FreeBSD 4.6-STABLE #3: Sat Aug 31 = 19:11:51 CDT 2002 root@gforce.johnson.home:/usr/obj/usr/src/sys/GFORCE = i386 >=20 Yeah, me too. Looks like this was caused by a munged MFC of uthread_fd.c. The attached patch should fix things for you. This seems to be the way it's done in -CURRENT, and it hasn't broken anything for me yet. Joe > --=20 > Glenn Johnson > glennpj@charter.net >=20 > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-stable" in the body of the message >=20 --=20 PGP Key : http://www.marcuscom.com/pgp.asc --=-8t1Lr39cfbA+4+EI2E5F Content-Disposition: attachment; filename=uthread_fd.c.diff Content-Type: text/plain; name=uthread_fd.c.diff; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable --- src/lib/libc_r/uthread/uthread_fd.c.orig Sat Aug 31 20:51:21 2002 +++ src/lib/libc_r/uthread/uthread_fd.c Sat Aug 31 20:52:51 2002 @@ -180,6 +180,22 @@ return (ret); } =20 +int +_thread_fd_getflags(int fd) +{ + if (_thread_fd_table[fd] !=3D NULL) + return (_thread_fd_table[fd]->flags); + else + return (0); +} + +void +_thread_fd_setflags(int fd, int flags) +{ + if (_thread_fd_table[fd] !=3D NULL) + _thread_fd_table[fd]->flags =3D flags; +} + #ifdef _FDLOCKS_ENABLED void _thread_fd_unlock(int fd, int lock_type) @@ -493,21 +509,6 @@ return (ret); } =20 -int -_thread_fd_getflags(int fd) -{ - if (_thread_fd_table[fd] !=3D NULL) - return (_thread_fd_table[fd]->flags); - else - return (0); -} - -void -_thread_fd_setflags(int fd, int flags) -{ - if (_thread_fd_table[fd] !=3D NULL) - _thread_fd_table[fd]->flags =3D flags; -} =20 void _thread_fd_unlock_debug(int fd, int lock_type, char *fname, int lineno) --=-8t1Lr39cfbA+4+EI2E5F-- --=-49Jfm++zTzIT3k0n3zYU Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (FreeBSD) iD8DBQA9cWX3b2iPiv4Uz4cRAiyUAJ9eZFxVOjHT5vkw1e1tiAasbyCHwACfaurH 7JmKOfxhJkQP+ZF4XZKo4WU= =/vY2 -----END PGP SIGNATURE----- --=-49Jfm++zTzIT3k0n3zYU-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message