From 1f5aafceb1de3a36ba60465f46c1ced40e7cb38b Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Mon, 28 Jul 2014 16:28:02 +0000 Subject: Rename devel/ patch-xy patches to reflect the files they modify. --- devel/libcii/files/patch-aa | 37 ------------------------- devel/libcii/files/patch-ab | 52 ----------------------------------- devel/libcii/files/patch-src_swtch.s | 52 +++++++++++++++++++++++++++++++++++ devel/libcii/files/patch-src_thread.c | 37 +++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 devel/libcii/files/patch-aa delete mode 100644 devel/libcii/files/patch-ab create mode 100644 devel/libcii/files/patch-src_swtch.s create mode 100644 devel/libcii/files/patch-src_thread.c (limited to 'devel/libcii/files') diff --git a/devel/libcii/files/patch-aa b/devel/libcii/files/patch-aa deleted file mode 100644 index d8b798e329d0..000000000000 --- a/devel/libcii/files/patch-aa +++ /dev/null @@ -1,37 +0,0 @@ ---- src/thread.c.orig Wed Nov 5 22:03:00 1997 -+++ src/thread.c Sun Jan 30 18:09:03 2000 -@@ -118,7 +118,7 @@ - && scp->sc_pc <= (unsigned long)_ENDMONITOR) - return 0; - put(current, &ready); -- sigsetmask(scp->sc_mask); -+ sigprocmask(SIG_SETMASK, NULL, &(scp->sc_mask)); - run(); - return 0; - } -@@ -243,13 +243,13 @@ - critical--; } while (0); - args = t->sp; - } --#if alpha -- { extern void _start(void); -+#if __alpha -+ { extern void _thrstart(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; } - #elif mips - { extern void _start(void); - t->sp -= 16/4; -@@ -269,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 - { extern void _thrstart(void); - t->sp -= 4/4; - *t->sp = (unsigned long)_thrstart; diff --git a/devel/libcii/files/patch-ab b/devel/libcii/files/patch-ab deleted file mode 100644 index 8e05f8ae602f..000000000000 --- a/devel/libcii/files/patch-ab +++ /dev/null @@ -1,52 +0,0 @@ ---- src/swtch.s.orig Thu Nov 6 06:03:00 1997 -+++ src/swtch.s Tue Jun 8 21:44:42 1999 -@@ -1,4 +1,4 @@ --#if alpha -+#if __alpha - .globl _swtch - .ent _swtch - _swtch: lda $sp,-112($sp) # allocate _swtch's frame -@@ -39,9 +39,10 @@ - lda $sp,112($sp) # deallocate frame - ret $31,($26) - .end _swtch --.globl _start --.ent _start --_start: .frame $sp,0,$26 -+.globl _thrstart -+.ent _thrstart -+_thrstart: -+ .frame $sp,0,$26 - .mask 0x0,0 - .prologue 0 - mov $14,$16 # register 14 holds args -@@ -52,7 +53,7 @@ - mov $13,$27 # register 13 has Thread_exit - jsr $26,($27) - call_pal 0 --.end _start -+.end _thrstart - .globl _ENDMONITOR - _ENDMONITOR: - #elif sparc -@@ -136,7 +137,7 @@ - .end _swtch - .globl _ENDMONITOR - _ENDMONITOR: --#elif linux && i386 -+#elif (linux || unix) && i386 - .align 4 - .globl __swtch - .globl _swtch -@@ -165,7 +166,11 @@ - pushl %edi - call *%esi - pushl %eax -+#ifdef __ELF__ - call Thread_exit -+#else -+ call _Thread_exit -+#endif - .globl __ENDMONITOR - .globl _ENDMONITOR - __ENDMONITOR: diff --git a/devel/libcii/files/patch-src_swtch.s b/devel/libcii/files/patch-src_swtch.s new file mode 100644 index 000000000000..8e05f8ae602f --- /dev/null +++ b/devel/libcii/files/patch-src_swtch.s @@ -0,0 +1,52 @@ +--- src/swtch.s.orig Thu Nov 6 06:03:00 1997 ++++ src/swtch.s Tue Jun 8 21:44:42 1999 +@@ -1,4 +1,4 @@ +-#if alpha ++#if __alpha + .globl _swtch + .ent _swtch + _swtch: lda $sp,-112($sp) # allocate _swtch's frame +@@ -39,9 +39,10 @@ + lda $sp,112($sp) # deallocate frame + ret $31,($26) + .end _swtch +-.globl _start +-.ent _start +-_start: .frame $sp,0,$26 ++.globl _thrstart ++.ent _thrstart ++_thrstart: ++ .frame $sp,0,$26 + .mask 0x0,0 + .prologue 0 + mov $14,$16 # register 14 holds args +@@ -52,7 +53,7 @@ + mov $13,$27 # register 13 has Thread_exit + jsr $26,($27) + call_pal 0 +-.end _start ++.end _thrstart + .globl _ENDMONITOR + _ENDMONITOR: + #elif sparc +@@ -136,7 +137,7 @@ + .end _swtch + .globl _ENDMONITOR + _ENDMONITOR: +-#elif linux && i386 ++#elif (linux || unix) && i386 + .align 4 + .globl __swtch + .globl _swtch +@@ -165,7 +166,11 @@ + pushl %edi + call *%esi + pushl %eax ++#ifdef __ELF__ + call Thread_exit ++#else ++ call _Thread_exit ++#endif + .globl __ENDMONITOR + .globl _ENDMONITOR + __ENDMONITOR: diff --git a/devel/libcii/files/patch-src_thread.c b/devel/libcii/files/patch-src_thread.c new file mode 100644 index 000000000000..d8b798e329d0 --- /dev/null +++ b/devel/libcii/files/patch-src_thread.c @@ -0,0 +1,37 @@ +--- src/thread.c.orig Wed Nov 5 22:03:00 1997 ++++ src/thread.c Sun Jan 30 18:09:03 2000 +@@ -118,7 +118,7 @@ + && scp->sc_pc <= (unsigned long)_ENDMONITOR) + return 0; + put(current, &ready); +- sigsetmask(scp->sc_mask); ++ sigprocmask(SIG_SETMASK, NULL, &(scp->sc_mask)); + run(); + return 0; + } +@@ -243,13 +243,13 @@ + critical--; } while (0); + args = t->sp; + } +-#if alpha +- { extern void _start(void); ++#if __alpha ++ { extern void _thrstart(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; } + #elif mips + { extern void _start(void); + t->sp -= 16/4; +@@ -269,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 + { extern void _thrstart(void); + t->sp -= 4/4; + *t->sp = (unsigned long)_thrstart; -- cgit v1.2.3