Date: Sat, 29 Jan 2000 16:44:12 +0100 (CET) From: Alexander Langer <alex@cichlids.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16441: fix devel/libcii (bentofied) Message-ID: <200001291544.QAA05095@cichlids.cichlids.com>
next in thread | raw e-mail | index | archive | help
>Number: 16441
>Category: ports
>Synopsis: fix devel/libcii (bentofied)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 29 07:50:02 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Alexander Langer
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
This space is intentionally left blank.
>Environment:
bento
>Description:
see bento, fix signal changes for -current
(sigsetmask --> sigprocmask)
>How-To-Repeat:
make all
>Fix:
--- libcii.diff begins here ---
--- patch-aa.old Sat Jan 29 16:42:23 2000
+++ patch-aa Sat Jan 29 16:42:28 2000
@@ -1,28 +1,38 @@
---- src/thread.c.orig Thu Nov 6 06:03:00 1997
-+++ src/thread.c Tue Jun 8 21:37:09 1999
-@@ -243,13 +243,13 @@
+--- thread.c Sat Jan 29 16:41:32 2000
++++ thread.c.orig Wed Nov 5 22:03:00 1997
+@@ -118,8 +118,7 @@
+ && scp->sc_pc <= (unsigned long)_ENDMONITOR)
+ return 0;
+ put(current, &ready);
+-
+- sigprocmask(SIG_SETMASK, NULL, &(scp->sc_mask));
++ sigsetmask(scp->sc_mask);
+ run();
+ return 0;
+ }
+@@ -244,13 +243,13 @@
critical--; } while (0);
args = t->sp;
}
--#if alpha
-- { extern void _start(void);
-+#if __alpha
-+ { extern void _thrstart(void);
+-#if __alpha
+- { extern void _thrstart(void);
++#if alpha
++ { extern void _start(void);
t->sp -= 112/8;
t->sp[(48+24)/8] = (unsigned long)Thread_exit;
t->sp[(48+16)/8] = (unsigned long)args;
t->sp[(48+ 8)/8] = (unsigned long)apply;
-- t->sp[(48+ 0)/8] = (unsigned long)_start; }
-+ t->sp[(48+ 0)/8] = (unsigned long)_thrstart; }
+- t->sp[(48+ 0)/8] = (unsigned long)_thrstart; }
++ t->sp[(48+ 0)/8] = (unsigned long)_start; }
#elif mips
{ extern void _start(void);
t->sp -= 16/4;
-@@ -269,7 +269,7 @@
+@@ -270,7 +269,7 @@
*--t->sp = (unsigned long)_start - 8;
*--t->sp = (unsigned long)fp;
t->sp -= 64/4; }
--#elif linux && i386
-+#elif (linux || unix) && i386
+-#elif (linux || unix) && i386
++#elif linux && i386
{ extern void _thrstart(void);
t->sp -= 4/4;
*t->sp = (unsigned long)_thrstart;
--- libcii.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001291544.QAA05095>