rpms/cvsup/devel cvsup-ppc.patch, NONE, 1.1 ezm3-1.2-PPC-setjmp-bootstrap.patch, NONE, 1.1 ezm3-1.2-PPC-setjmp.patch, NONE, 1.1 ezm3-1.2-ppc-jmpbufsize.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 cvsup.spec, 1.5, 1.6 sources, 1.2, 1.3

David Woodhouse (dwmw2) fedora-extras-commits at redhat.com
Sun Feb 13 02:48:55 UTC 2005 

Author: dwmw2

Update of /cvs/extras/rpms/cvsup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27988

Modified Files:
	.cvsignore cvsup.spec sources 
Added Files:
	cvsup-ppc.patch ezm3-1.2-PPC-setjmp-bootstrap.patch 
	ezm3-1.2-PPC-setjmp.patch ezm3-1.2-ppc-jmpbufsize.patch 
Log Message:
Add PPC support. Wheee


cvsup-ppc.patch:

--- NEW FILE cvsup-ppc.patch ---
--- cvsup-snap-16.1h/suplib/src/m3makefile.orig	2005-02-09 10:16:06.913170504 +0000
+++ cvsup-snap-16.1h/suplib/src/m3makefile	2005-02-09 10:18:10.704351384 +0000
@@ -45,6 +45,7 @@
 
 readonly DevTPieces = {
   "LINUXLIBC6" : [ "dev_t_linux" ],
+  "PPC_LINUX"  : [ "dev_t_linuxbe" ],
   "default"    : [ "dev_t_posix" ]
 }
 
--- cvsup-snap-16.1h/suplib/src/dev_t_linuxbe/m3makefile.orig	2005-02-09 10:18:22.992483304 +0000
+++ cvsup-snap-16.1h/suplib/src/dev_t_linuxbe/m3makefile	2005-02-09 10:18:01.435760424 +0000
@@ -0,0 +1,32 @@
+% Copyright 1999-2003 John D. Polstra.
+% All rights reserved.
+%
+% Redistribution and use in source and binary forms, with or without
+% modification, are permitted provided that the following conditions
+% are met:
+% 1. Redistributions of source code must retain the above copyright
+%    notice, this list of conditions and the following disclaimer.
+% 2. Redistributions in binary form must reproduce the above copyright
+%    notice, this list of conditions and the following disclaimer in the
+%    documentation and/or other materials provided with the distribution.
+% 3. All advertising materials mentioning features or use of this software
+%    must display the following acknowledgment:
+%      This product includes software developed by John D. Polstra.
+% 4. The name of the author may not be used to endorse or promote products
+%    derived from this software without specific prior written permission.
+%
+% THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+% IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+% OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+% IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+% INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+% NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+% DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+% THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+% (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+% THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+%
+% $Id: m3makefile,v 1.3 2003/03/04 19:26:33 jdp Exp $
+
+interface("DevTLinux")
+implementation("DevT")
--- cvsup-snap-16.1h/suplib/src/dev_t_linuxbe/DevT.m3.orig	2005-02-09 10:18:27.217840952 +0000
+++ cvsup-snap-16.1h/suplib/src/dev_t_linuxbe/DevT.m3	2005-02-09 10:27:25.861954600 +0000
@@ -0,0 +1,112 @@
+(* Copyright 1999-2003 John D. Polstra.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgment:
+ *      This product includes software developed by John D. Polstra.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: DevT.m3,v 1.3 2003/03/04 19:26:32 jdp Exp $ *)
+
+UNSAFE MODULE DevT;
+
+IMPORT
+  CText, Ctypes, DevTLinux, Fmt, OSError, OSErrorPosix, Text, TokScan,
+  Utypes, Word;
+
+PROCEDURE Decode(t: TEXT): T
+  RAISES {TokScan.Error} =
+  VAR
+    dev: T;
+    len := Text.Length(t);
+    chunkLen := 2 * BYTESIZE(dev[0]);
+  BEGIN
+    IF len > chunkLen * NUMBER(dev) THEN
+      RAISE TokScan.Error("encoded dev_t too long");
+    END;
+    (* XXX - This is specific to big-endian machines. *)
+    FOR i := LAST(dev) TO FIRST(dev) BY -1 DO
+      IF len > 0 THEN
+	WITH start = MAX(len - chunkLen, 0) DO
+	  dev[i] := TokScan.AtoI(Text.Sub(t, start, len - start),
+	    "dev_t chunk", 16);
+	  len := start;
+	END;
+      ELSE
+	dev[i] := 0;
+      END;
+    END;
+    RETURN dev;
+  END Decode;
+
+PROCEDURE Encode(READONLY dev: T): TEXT =
+  VAR
+    i: INTEGER;
+    t: TEXT;
+    chunkLen := 2 * BYTESIZE(dev[0]);
+  BEGIN
+    (* XXX - This is specific to big-endian machines. *)
+    i := FIRST(dev);
+    WHILE i < LAST(dev) AND dev[i] = 0 DO
+      INC(i);
+    END;
+    t := Fmt.Unsigned(dev[i], 16);
+    WHILE i < LAST(dev) DO
+      INC(i);
+      t := t & Fmt.Pad(Fmt.Unsigned(dev[i], 16), chunkLen, '0');
+    END;
+    RETURN t;
+  END Encode;
+
+PROCEDURE Equal(READONLY a, b: T): BOOLEAN =
+  BEGIN
+    RETURN a = b;
+  END Equal;
+
+PROCEDURE Hash(READONLY dev: T): Word.T =
+  VAR
+    h: Word.T := 0;
+  BEGIN
+    FOR i := FIRST(dev) TO LAST(dev) DO
+      h := Word.Xor(h, dev[i]);
+    END;
+    RETURN h;
+  END Hash;
+
+PROCEDURE Mknod(path: TEXT;
+                mode: Utypes.mode_t;
+		READONLY dev: T) RAISES {OSError.E} =
+  VAR
+    pathStr: Ctypes.char_star;
+    r: Ctypes.int;
+  BEGIN
+    pathStr := CText.SharedTtoS(path);
+    r := DevTLinux.mknod(pathStr, mode, dev);
+    CText.FreeSharedS(path, pathStr);
+    IF r = -1 THEN
+      OSErrorPosix.Raise();
+    END;
+  END Mknod;
+
+BEGIN
+END DevT.
--- cvsup-snap-16.1h/suplib/src/dev_t_linuxbe/DevTLinux.i3.orig	2005-02-09 10:18:32.265073656 +0000
+++ cvsup-snap-16.1h/suplib/src/dev_t_linuxbe/DevTLinux.i3	2005-02-09 10:18:01.435760424 +0000
@@ -0,0 +1,45 @@
+(* Copyright 1999-2003 John D. Polstra.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgment:
+ *      This product includes software developed by John D. Polstra.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: DevTLinux.i3,v 1.2 2003/03/04 19:26:32 jdp Exp $ *)
+
+INTERFACE DevTLinux;
+
+(* The "Unix.mknod" procedure is misdeclared in some versions of PM3
+   for the LINUXLIBC6 target.  We work around the problem by using our
+   own declaration of it here. *)
+
+IMPORT
+  Ctypes, DevT, Utypes;
+
+<* EXTERNAL "mknod" *>
+PROCEDURE mknod(path: Ctypes.char_star;
+                mode: Utypes.mode_t;
+		dev: DevT.T): Ctypes.int;
+
+END DevTLinux.

ezm3-1.2-PPC-setjmp-bootstrap.patch:

--- NEW FILE ezm3-1.2-PPC-setjmp-bootstrap.patch ---
--- ezm3-1.2/boot-PPC_LINUX/m3core/PPC_LINUX/ThreadPosix.ms.orig	2004-07-12 03:02:17.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3core/PPC_LINUX/ThreadPosix.ms	2005-02-08 23:41:37.540028968 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"ThreadPosix.mc"
 	.lcomm	L_1,364,4
 	.section	".text"
--- ezm3-1.2/boot-PPC_LINUX/m3core/PPC_LINUX/RTException.ms.orig	2005-02-08 23:42:32.202718976 +0000
+++ ezm3-1.2/boot-PPC_LINUX/m3core/PPC_LINUX/RTException.ms	2005-02-08 23:42:25.696708040 +0000
@@ -1,3 +1,4 @@
+	.symver _longjmp,_longjmp at GLIBC_2.0
 	.file	"RTException.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3core/PPC_LINUX/RTThreadC.ms.orig	2005-02-09 00:02:36.371657472 +0000
+++ ezm3-1.2/boot-PPC_LINUX/m3core/PPC_LINUX/RTThreadC.ms	2005-02-09 00:02:36.371657472 +0000
@@ -0,0 +1,127 @@
+.symver _setjmp,_setjmp at GLIBC_2.0
+.symver longjmp,longjmp at GLIBC_2.0
+	.file	"RTThreadC.c"
+	.section	".text"
+	.align 2
+	.globl RTThread__Transfer
+	.type	RTThread__Transfer, at function
+RTThread__Transfer:
+	stwu 1,-240(1)
+	mflr 0
+	mfcr 12
+	stfd 14,96(1)
+	stfd 15,104(1)
+	stfd 16,112(1)
+	stfd 17,120(1)
+	stfd 18,128(1)
+	stfd 19,136(1)
+	stfd 20,144(1)
+	stfd 21,152(1)
+	stfd 22,160(1)
+	stfd 23,168(1)
+	stfd 24,176(1)
+	stfd 25,184(1)
+	stfd 26,192(1)
+	stfd 27,200(1)
+	stfd 28,208(1)
+	stfd 29,216(1)
+	stfd 30,224(1)
+	stfd 31,232(1)
+	stw 14,24(1)
+	stw 15,28(1)
+	stw 16,32(1)
+	stw 17,36(1)
+	stw 18,40(1)
+	stw 19,44(1)
+	stw 20,48(1)
+	stw 21,52(1)
+	stw 22,56(1)
+	stw 23,60(1)
+	stw 24,64(1)
+	stw 25,68(1)
+	stw 26,72(1)
+	stw 27,76(1)
+	stw 28,80(1)
+	stw 29,84(1)
+	stw 30,88(1)
+	stw 31,92(1)
+	stw 0,244(1)
+	stw 12,20(1)
+	mr 31,1
+	stw 3,8(31)
+	stw 4,12(31)
+	lwz 3,8(31)
+	bl _setjmp
+	mr 0,3
+	cmpwi 0,0,0
+	bne 0,.L2
+	lwz 3,12(31)
+	li 4,1
+	bl longjmp
+.L2:
+	mr 3,0
+	lwz 11,0(1)
+	lwz 0,4(11)
+	lwz 12,-220(11)
+	mtlr 0
+	lwz 14,-216(11)
+	lwz 15,-212(11)
+	lwz 16,-208(11)
+	lwz 17,-204(11)
+	lwz 18,-200(11)
+	lwz 19,-196(11)
+	lwz 20,-192(11)
+	lwz 21,-188(11)
+	lwz 22,-184(11)
+	lwz 23,-180(11)
+	lwz 24,-176(11)
+	lwz 25,-172(11)
+	lwz 26,-168(11)
+	lwz 27,-164(11)
+	lwz 28,-160(11)
+	lwz 29,-156(11)
+	lwz 30,-152(11)
+	lwz 31,-148(11)
+	lfd 14,-144(11)
+	lfd 15,-136(11)
+	lfd 16,-128(11)
+	lfd 17,-120(11)
+	lfd 18,-112(11)
+	lfd 19,-104(11)
+	lfd 20,-96(11)
+	lfd 21,-88(11)
+	lfd 22,-80(11)
+	lfd 23,-72(11)
+	lfd 24,-64(11)
+	lfd 25,-56(11)
+	lfd 26,-48(11)
+	lfd 27,-40(11)
+	lfd 28,-32(11)
+	lfd 29,-24(11)
+	lfd 30,-16(11)
+	lfd 31,-8(11)
+	mtcrf 56,12
+	mr 1,11
+	blr
+	.size	RTThread__Transfer,.-RTThread__Transfer
+	.globl ThreadF__myId
+	.section	".sdata","aw"
+	.align 2
+	.type	ThreadF__myId, at object
+	.size	ThreadF__myId,4
+ThreadF__myId:
+	.long	1
+	.globl RT0u__inCritical
+	.align 2
+	.type	RT0u__inCritical, at object
+	.size	RT0u__inCritical,4
+RT0u__inCritical:
+	.long	0
+	.globl RTThread__handlerStack
+	.align 2
+	.type	RTThread__handlerStack, at object
+	.size	RTThread__handlerStack,4
+RTThread__handlerStack:
+	.long	0
+	.section	.note.GNU-stack,"", at progbits
+	.ident	"GCC: (GNU) 3.2.3 20030502 (Red Hat Linux 3.2.3-46)"
--- ezm3-1.2/boot-PPC_LINUX/m3core/PPC_LINUX/make.boot.orig	2005-02-09 00:04:24.687191008 +0000
+++ ezm3-1.2/boot-PPC_LINUX/m3core/PPC_LINUX/make.boot	2005-02-09 00:01:35.704880224 +0000
@@ -85,7 +85,7 @@
 RTHeapDep_m.o: RTHeapDep.ms
 RTSignal_m.o: RTSignal.ms
 RTThread_m.o: RTThread.ms
-RTThreadC.o: RTThreadC.c
+RTThreadC_m.o: RTThreadC.ms
 RTException_m.o: RTException.ms
 RTExRep_i.o: RTExRep.is
 RTStackC.o: RTStackC.c
@@ -197,7 +197,7 @@
 Word_i.o: Word.is
 Word_m.o: Word.ms
 
-OBJS=Word_m.o Word_i.o WeakRef_m.o WeakRef_i.o Main_i.o PolyBasis_m.o PolyBasis_i.o Poly_m.o Poly_i.o Fingerprint_m.o Fingerprint_i.o TextConv_m.o TextConv_i.o UnsafeHash_m.o TextF_i.o TextExtras_m.o TextExtras_i.o Text_m.o Text_i.o Convert_m.o Convert_i.o CConvert_m.o CConvert_i.o TimePosix_m.o TimePosix_i.o DateBsd_m.o TickPortable_m.o FmtTime_m.o FmtTime_i.o Date_i.o Tick_i.o Time_i.o FloatMode_m.o FloatMode_i.o FPU_m.o FPU_i.o LongRealRep_i.o RealRep_i.o ExtendedFloat_m.o LongFloat_m.o RealFloat_m.o Extended_i.o LongReal_i.o Real_i.o DragonT_m.o DragonT_i.o DragonInt_m.o DragonInt_i.o Extended_m.o LongReal_m.o Real_m.o IEEESpecial_m.o IEEESpecial_i.o ExtendedFloat_i.o LongFloat_i.o RealFloat_i.o BasicCtypes_i.o Cstdio_m.o Cstdio_i.o Cstring_i.o Csignal_i.o Csetjmp_i.o CerrnoC.o Cstdarg_m.o Cstdarg_i.o M3toC_m.o M3toC_i.o Ctypes_i.o Cstdlib_i.o Cstddef_i.o Cerrno_i.o Uin_m.o Upaths_i.o Uutmp_i.o Uuio_i.o Uugid_i.o Utypes_m.o Utypes_i.o Utime_i.o Usyslog_i.o Usocket_i.o U!
stat_i.o Usignal_m.o Usignal_i.o Ushm_i.o Usem_i.o Uresource_i.o Upwd_i.o Uprocess_i.o Unix_i.o Unetdb_m.o Unetdb_i.o Umsg_m.o Umsg_i.o Umman_i.o Uipc_i.o Uin_i.o Ugrp_i.o Uexec_i.o Uerror_i.o Udir_i.o ThreadPosix_m.o ThreadEvent_i.o ThreadF_i.o SchedulerPosix_i.o Scheduler_i.o Thread_i.o RTStackC.o RTExRep_i.o RTException_m.o RTThreadC.o RTThread_m.o RTSignal_m.o RTHeapDep_m.o RTMachine_i.o RTThreadStk_m.o RTThread_i.o RTPerfTool_m.o RTPerfTool_i.o RTOS_m.o RTArgs_m.o RT0u_m.o RT0u_i.o RTThreadInit_i.o RTOS_i.o RTTypeSRC_i.o RTStack_i.o RTSignal_i.o RTProcedureSRC_i.o RTHeapEvent_i.o RTException_i.o RTArgs_i.o RTHeapDebug_m.o RTHeapDebug_i.o RTutils_m.o RTutils_i.o RTTypeMap_m.o RTTypeMap_i.o RTTypeFP_m.o RTTypeFP_i.o RTType_m.o RTType_i.o RTTipe_m.o RTTipe_i.o RTProcess_m.o RTProcess_i.o RTProcedure_m.o RTProcedure_i.o RTParams_m.o RTParams_i.o RTPacking_m.o RTPacking_i.o RTModule_m.o RTModule_i.o RTMisc_m.o RTMisc_i.o RTMapOp_m.o RTMapOp_i.o RTLinker_m.o RTLinker_i.o RTIO!
_m.o RTIO_i.o RTWeakRef_i.o RTCollectorSRC_i.o RTCollector_m.!
 o RTColl
ector_i.o RTHeapStats_m.o RTHeapStats_i.o RTHeapRep_m.o RTHeapRep_i.o RTHeapMap_m.o RTHeapMap_i.o RTHeapInfo_m.o RTHeapInfo_i.o RTHeapDep_i.o RTHeap_m.o RTHeap_i.o RTAllocStats_m.o RTAllocStats_i.o RTAllocator_m.o RTAllocator_i.o RT0_m.o RT0_i.o RTHooks_m.o RTHooks_i.o RTBuiltin.o dtoa.o hand.o 
+OBJS=Word_m.o Word_i.o WeakRef_m.o WeakRef_i.o Main_i.o PolyBasis_m.o PolyBasis_i.o Poly_m.o Poly_i.o Fingerprint_m.o Fingerprint_i.o TextConv_m.o TextConv_i.o UnsafeHash_m.o TextF_i.o TextExtras_m.o TextExtras_i.o Text_m.o Text_i.o Convert_m.o Convert_i.o CConvert_m.o CConvert_i.o TimePosix_m.o TimePosix_i.o DateBsd_m.o TickPortable_m.o FmtTime_m.o FmtTime_i.o Date_i.o Tick_i.o Time_i.o FloatMode_m.o FloatMode_i.o FPU_m.o FPU_i.o LongRealRep_i.o RealRep_i.o ExtendedFloat_m.o LongFloat_m.o RealFloat_m.o Extended_i.o LongReal_i.o Real_i.o DragonT_m.o DragonT_i.o DragonInt_m.o DragonInt_i.o Extended_m.o LongReal_m.o Real_m.o IEEESpecial_m.o IEEESpecial_i.o ExtendedFloat_i.o LongFloat_i.o RealFloat_i.o BasicCtypes_i.o Cstdio_m.o Cstdio_i.o Cstring_i.o Csignal_i.o Csetjmp_i.o CerrnoC.o Cstdarg_m.o Cstdarg_i.o M3toC_m.o M3toC_i.o Ctypes_i.o Cstdlib_i.o Cstddef_i.o Cerrno_i.o Uin_m.o Upaths_i.o Uutmp_i.o Uuio_i.o Uugid_i.o Utypes_m.o Utypes_i.o Utime_i.o Usyslog_i.o Usocket_i.o U!
stat_i.o Usignal_m.o Usignal_i.o Ushm_i.o Usem_i.o Uresource_i.o Upwd_i.o Uprocess_i.o Unix_i.o Unetdb_m.o Unetdb_i.o Umsg_m.o Umsg_i.o Umman_i.o Uipc_i.o Uin_i.o Ugrp_i.o Uexec_i.o Uerror_i.o Udir_i.o ThreadPosix_m.o ThreadEvent_i.o ThreadF_i.o SchedulerPosix_i.o Scheduler_i.o Thread_i.o RTStackC.o RTExRep_i.o RTException_m.o RTThreadC_m.o RTThread_m.o RTSignal_m.o RTHeapDep_m.o RTMachine_i.o RTThreadStk_m.o RTThread_i.o RTPerfTool_m.o RTPerfTool_i.o RTOS_m.o RTArgs_m.o RT0u_m.o RT0u_i.o RTThreadInit_i.o RTOS_i.o RTTypeSRC_i.o RTStack_i.o RTSignal_i.o RTProcedureSRC_i.o RTHeapEvent_i.o RTException_i.o RTArgs_i.o RTHeapDebug_m.o RTHeapDebug_i.o RTutils_m.o RTutils_i.o RTTypeMap_m.o RTTypeMap_i.o RTTypeFP_m.o RTTypeFP_i.o RTType_m.o RTType_i.o RTTipe_m.o RTTipe_i.o RTProcess_m.o RTProcess_i.o RTProcedure_m.o RTProcedure_i.o RTParams_m.o RTParams_i.o RTPacking_m.o RTPacking_i.o RTModule_m.o RTModule_i.o RTMisc_m.o RTMisc_i.o RTMapOp_m.o RTMapOp_i.o RTLinker_m.o RTLinker_i.o RT!
IO_m.o RTIO_i.o RTWeakRef_i.o RTCollectorSRC_i.o RTCollector_!
 m.o RTCo
llector_i.o RTHeapStats_m.o RTHeapStats_i.o RTHeapRep_m.o RTHeapRep_i.o RTHeapMap_m.o RTHeapMap_i.o RTHeapInfo_m.o RTHeapInfo_i.o RTHeapDep_i.o RTHeap_m.o RTHeap_i.o RTAllocStats_m.o RTAllocStats_i.o RTAllocator_m.o RTAllocator_i.o RT0_m.o RT0_i.o RTHooks_m.o RTHooks_i.o RTBuiltin.o dtoa.o hand.o 
 
 libm3core.a: $(OBJS)
 	$(AR) $(ARFLAGS) $@ $^
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/FSPosix.ms.orig	2004-07-12 03:02:35.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/FSPosix.ms	2005-02-08 23:41:37.549027600 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"FSPosix.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/PathnamePosix.ms.orig	2004-07-12 03:02:35.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/PathnamePosix.ms	2005-02-08 23:41:37.557026384 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"PathnamePosix.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/ProcessPosix.ms.orig	2004-07-12 03:02:36.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/ProcessPosix.ms	2005-02-08 23:41:37.565025168 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"ProcessPosix.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/IO.ms.orig	2004-07-12 03:02:39.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/IO.ms	2005-02-08 23:41:37.575023648 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"IO.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/FileRd.ms.orig	2004-07-12 03:02:39.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/FileRd.ms	2005-02-08 23:41:37.583022432 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"FileRd.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/FileWr.ms.orig	2004-07-12 03:02:39.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/FileWr.ms	2005-02-08 23:41:37.592021064 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"FileWr.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/Stdio.ms.orig	2004-07-12 03:02:39.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/Stdio.ms	2005-02-08 23:41:37.599020000 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"Stdio.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/AutoFlushWr.ms.orig	2004-07-12 03:02:39.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/AutoFlushWr.ms	2005-02-08 23:41:37.608018632 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"AutoFlushWr.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/Lex.ms.orig	2004-07-12 03:02:41.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/Lex.ms	2005-02-08 23:41:37.618017112 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"Lex.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/Sx.ms.orig	2004-07-12 03:02:44.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/Sx.ms	2005-02-08 23:41:37.627015744 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"Sx.mc"
 	.lcomm	L_1,804,4
 	.lcomm	L_2,1024,4
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/Formatter.ms.orig	2004-07-12 03:02:47.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/Formatter.ms	2005-02-08 23:41:37.639013920 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"Formatter.mc"
 	.lcomm	L_1,2052,4
 	.lcomm	L_2,1024,4
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/PerfTool.ms.orig	2004-07-12 03:02:55.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/PerfTool.ms	2005-02-08 23:41:37.647012704 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"PerfTool.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/LowPerfTool.ms.orig	2004-07-12 03:02:55.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/LowPerfTool.ms	2005-02-08 23:41:37.655011488 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"LowPerfTool.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/PklTipeMap.ms.orig	2004-07-12 03:02:57.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/PklTipeMap.ms	2005-02-08 23:41:37.665009968 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"PklTipeMap.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/Pickle.ms.orig	2004-07-12 03:02:59.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/Pickle.ms	2005-02-08 23:41:37.674008600 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"Pickle.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/PickleStubs.ms.orig	2004-07-12 03:02:59.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/libm3/PPC_LINUX/PickleStubs.ms	2005-02-08 23:41:37.685006928 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"PickleStubs.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3middle/PPC_LINUX/CoffTime.ms.orig	2004-07-12 03:03:03.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3middle/PPC_LINUX/CoffTime.ms	2005-02-08 23:41:37.696005256 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"CoffTime.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3middle/PPC_LINUX/Target.ms.orig	2004-07-12 03:03:03.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3middle/PPC_LINUX/Target.ms	2005-02-08 23:41:37.704004040 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"Target.mc"
 	.section	.rodata
 	.align 3
--- ezm3-1.2/boot-PPC_LINUX/m3middle/PPC_LINUX/TFloat.ms.orig	2004-07-12 03:03:04.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3middle/PPC_LINUX/TFloat.ms	2005-02-08 23:41:37.715002368 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"TFloat.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3middle/PPC_LINUX/M3File.ms.orig	2004-07-12 03:03:05.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3middle/PPC_LINUX/M3File.ms	2005-02-08 23:41:37.723001152 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"M3File.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3front/PPC_LINUX/Host.ms.orig	2004-07-12 03:03:33.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3front/PPC_LINUX/Host.ms	2005-02-08 23:41:37.730999936 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"Host.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3linker/PPC_LINUX/MxIn.ms.orig	2004-07-12 03:03:48.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3linker/PPC_LINUX/MxIn.ms	2005-02-08 23:41:37.739998568 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"MxIn.mc"
 	.lcomm	L_1,1024,4
 	.section	".text"
--- ezm3-1.2/boot-PPC_LINUX/m3driver/PPC_LINUX/Msg.ms.orig	2004-07-12 03:03:52.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3driver/PPC_LINUX/Msg.ms	2005-02-08 23:41:37.747997352 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"Msg.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3driver/PPC_LINUX/Unit.ms.orig	2004-07-12 03:03:52.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3driver/PPC_LINUX/Unit.ms	2005-02-08 23:41:37.757995832 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"Unit.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3driver/PPC_LINUX/Utils.ms.orig	2004-07-12 03:03:52.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3driver/PPC_LINUX/Utils.ms	2005-02-08 23:41:37.765994616 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"Utils.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3driver/PPC_LINUX/WebFile.ms.orig	2004-07-12 03:03:52.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3driver/PPC_LINUX/WebFile.ms	2005-02-08 23:41:37.773993400 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"WebFile.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3driver/PPC_LINUX/M3Driver.ms.orig	2004-07-12 03:03:54.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3driver/PPC_LINUX/M3Driver.ms	2005-02-08 23:41:37.784991728 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"M3Driver.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3quake/PPC_LINUX/QScanner.ms.orig	2004-07-12 03:03:55.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3quake/PPC_LINUX/QScanner.ms	2005-02-08 23:41:37.793990360 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"QScanner.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3quake/PPC_LINUX/QCompiler.ms.orig	2004-07-12 03:03:55.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3quake/PPC_LINUX/QCompiler.ms	2005-02-08 23:41:37.803988840 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"QCompiler.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3quake/PPC_LINUX/QMachine.ms.orig	2004-07-12 03:03:57.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3quake/PPC_LINUX/QMachine.ms	2005-02-08 23:41:37.813987320 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"QMachine.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3templates/PPC_LINUX/BldQuake.ms.orig	2004-07-12 03:04:02.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3templates/PPC_LINUX/BldQuake.ms	2005-02-08 23:41:37.828985040 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"BldQuake.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3templates/PPC_LINUX/BldFace.ms.orig	2004-07-12 03:04:02.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3templates/PPC_LINUX/BldFace.ms	2005-02-08 23:41:37.837983672 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"BldFace.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3templates/PPC_LINUX/BldPosix.ms.orig	2004-07-12 03:04:03.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3templates/PPC_LINUX/BldPosix.ms	2005-02-08 23:41:37.845982456 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"BldPosix.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3templates/PPC_LINUX/BldWin32.ms.orig	2004-07-12 03:04:03.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3templates/PPC_LINUX/BldWin32.ms	2005-02-08 23:41:37.855980936 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"BldWin32.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3build/PPC_LINUX/Main.ms.orig	2004-07-12 03:04:04.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3build/PPC_LINUX/Main.ms	2005-02-08 23:41:37.863979720 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"Main.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3ship/PPC_LINUX/Main.ms.orig	2004-07-12 03:04:05.000000000 +0100
+++ ezm3-1.2/boot-PPC_LINUX/m3ship/PPC_LINUX/Main.ms	2005-02-08 23:41:37.873978200 +0000
@@ -1,3 +1,4 @@
+	.symver _setjmp,_setjmp at GLIBC_2.0
 	.file	"Main.mc"
 	.section	".text"
 	.align 2
--- ezm3-1.2/boot-PPC_LINUX/m3middle/PPC_LINUX/Target.ms.orig	2005-02-12 16:56:49.000000000 +0000
+++ ezm3-1.2/boot-PPC_LINUX/m3middle/PPC_LINUX/Target.ms	2005-02-12 16:57:20.000000000 +0000
@@ -5363,7 +5363,7 @@ MM_Target:
 	.long	2048
 	.long	MM_Target+1380
 	.long	8
-	.ascii	"_setjmp"
+	.ascii	"_setjp2"
 	.zero	1
 	.long	2048
 	.long	MM_Target+1400

ezm3-1.2-PPC-setjmp.patch:

--- NEW FILE ezm3-1.2-PPC-setjmp.patch ---
--- ezm3-1.2/libs/m3core/src/C/PPC_LINUX/Csetjmp.i3.orig	2005-02-09 09:16:35.333133200 +0000
+++ ezm3-1.2/libs/m3core/src/C/PPC_LINUX/Csetjmp.i3	2005-02-09 09:16:55.740030880 +0000
@@ -22,7 +22,7 @@
 <*EXTERNAL*> PROCEDURE setjmp (VAR env: jmp_buf): int;
 <*EXTERNAL*> PROCEDURE longjmp (VAR env: jmp_buf; val: int);
 
-<*EXTERNAL "_setjmp" *>  PROCEDURE usetjmp (VAR env: jmp_buf): int;
-<*EXTERNAL "_longjmp" *> PROCEDURE ulongjmp (VAR env: jmp_buf; val: int);
+<*EXTERNAL "glibc2_setjmp" *>  PROCEDURE usetjmp (VAR env: jmp_buf): int;
+<*EXTERNAL "glibc2_longjmp" *> PROCEDURE ulongjmp (VAR env: jmp_buf; val: int);
 
 END Csetjmp.
--- ezm3-1.2/libs/m3core/src/runtime/PPC_LINUX/RTThreadC.c.orig	2005-02-09 09:18:27.509079864 +0000
+++ ezm3-1.2/libs/m3core/src/runtime/PPC_LINUX/RTThreadC.c	2005-02-09 09:30:52.776781952 +0000
@@ -8,6 +8,11 @@
 
 #include <setjmp.h>
 
+/* Evil to do this and use the above header, but since we never
+   touch the jmp_buf we should get away with it. */
+__asm__(".symver _setjmp,_setjmp at GLIBC_2.0\n");
+__asm__(".symver longjmp,longjmp at GLIBC_2.0\n");
+
 RTThread__Transfer (from, to)
 jmp_buf *from, *to;
 {
--- ezm3-1.2/libs/m3core/src/runtime/PPC_LINUX/RTMachine.i3.orig	2005-02-09 12:17:39.055596352 +0000
+++ ezm3-1.2/libs/m3core/src/runtime/PPC_LINUX/RTMachine.i3	2005-02-09 12:17:56.845891816 +0000
@@ -18,7 +18,7 @@
   (* The machine state is saved in a "State".  This type is really
      opaque to the client, i.e. it does not need to be an array. *)
 
-<*EXTERNAL "_setjmp" *>
+<*EXTERNAL "glibc2_setjmp" *>
 PROCEDURE SaveState (VAR s: State): INTEGER;
 (* Capture the currently running thread's state *)
 
--- ezm3-1.2/libs/m3core/src/runtime/PPC_LINUX/m3makefile.orig	2005-02-09 12:21:10.145505808 +0000
+++ ezm3-1.2/libs/m3core/src/runtime/PPC_LINUX/m3makefile	2005-02-09 12:21:23.675448944 +0000
@@ -11,4 +11,4 @@
 implementation ("RTSignal")
 implementation ("RTThread")
 c_source       ("RTThreadC")
-
+s_source       ("setjmp")
--- ezm3-1.2/libs/m3core/src/runtime/PPC_LINUX/setjmp.s.orig	2005-02-09 12:21:03.769475112 +0000
+++ ezm3-1.2/libs/m3core/src/runtime/PPC_LINUX/setjmp.s	2005-02-09 12:20:59.351146800 +0000
@@ -0,0 +1,21 @@
+
+	.symver _setjmp,_setjmp at GLIBC_2.0
+	.symver _longjmp,_longjmp at GLIBC_2.0
+
+	.section ".text"
+
+	.globl glibc2_setjmp
+	.type glibc2_setjmp, @function
+	.globl _setjp2
+	.type _setjp2, @function
+
+_setjp2:
+glibc2_setjmp:
+	b	_setjmp	
+
+	.globl glibc2_longjmp
+	.type glibc2_longjmp, @function
+
+glibc2_longjmp:
+	b	_longjmp	
+
--- ezm3-1.2/language/modula3/m3compiler/m3middle/src/Target.m3.orig	2005-02-12 16:39:40.000000000 +0000
+++ ezm3-1.2/language/modula3/m3compiler/m3middle/src/Target.m3	2005-02-12 16:40:00.000000000 +0000
@@ -547,7 +547,7 @@ PROCEDURE Init (system: TEXT; back_integ
                  Guard_page_size           := 0 * Char.size;
                  All_floats_legal          := TRUE;
                  Has_stack_walker          := FALSE;
-                 Setjmp                    := "_setjmp";
+                 Setjmp                    := "glibc2_setjmp";
                  Checks_integer_ops        := FALSE;
                  Global_handler_stack      := TRUE;
                  Aligned_procedures        := TRUE;

ezm3-1.2-ppc-jmpbufsize.patch:

--- NEW FILE ezm3-1.2-ppc-jmpbufsize.patch ---
--- ezm3-1.2/libs/m3core/src/C/PPC_LINUX/Csetjmp.i3.orig	2005-02-09 09:53:31.952155888 +0000
+++ ezm3-1.2/libs/m3core/src/C/PPC_LINUX/Csetjmp.i3	2005-02-09 09:53:22.277626640 +0000
@@ -14,7 +14,7 @@
   ptr_t = void_star;
 
   jmp_buf = RECORD
-    regs: ARRAY [0..57] OF long;
+    regs: ARRAY [0..147] OF long;
     mask_was_saved: long;
     saved_mask: Usignal.sigset_t; 
   END;
--- ezm3-1.2/language/modula3/m3compiler/m3middle/src/Target.m3.orig	2005-02-12 16:07:55.000000000 +0000
+++ ezm3-1.2/language/modula3/m3compiler/m3middle/src/Target.m3	2005-02-12 16:15:51.000000000 +0000
@@ -541,9 +541,8 @@ PROCEDURE Init (system: TEXT; back_integ
                  Structure_size_boundary   := 8;
                  Bitfield_can_overlap      := FALSE;
                  First_readable_addr       := 4096 * Char.size;
-                 Jumpbuf_size              := 58 * Address.size + 
-                                              32 * Address.size + 4;
-                 Jumpbuf_align             := Address.align;
+                 Jumpbuf_size              := 592;
+                 Jumpbuf_align             := 16;
                  Fixed_frame_size          := 8 * Address.size;
                  Guard_page_size           := 0 * Char.size;
                  All_floats_legal          := TRUE;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cvsup/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:13:00 -0000	1.2
+++ .cvsignore	13 Feb 2005 02:48:53 -0000	1.3
@@ -1,3 +1,4 @@
 cvsup-snap-16.1h.tar.gz
-ezm3-1.1-LINUXLIBC6-boot.tar.bz2
-ezm3-1.1-src.tar.bz2
+ezm3-1.2-src.tar.bz2
+ezm3-1.2-LINUXLIBC6-boot.tar.bz2
+ezm3-1.2-PPC_LINUX-boot.tar.bz2


Index: cvsup.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsup/devel/cvsup.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cvsup.spec	10 Dec 2004 22:03:02 -0000	1.5
+++ cvsup.spec	13 Feb 2005 02:48:53 -0000	1.6
@@ -1,13 +1,13 @@
 %define confdir %{_sysconfdir}/cvsupd
 %define logdir /var/log/cvsupd
 %define m3name ezm3
-%define m3ver 1.1
+%define m3ver 1.2
 %define snapver 16.1h
 
 Summary: CVS-Optimized General-Purpose Network File Distribution System client
 Name: cvsup
 Version: 16.1
-Release: 6.h
+Release: 7.h
 Epoch: 0
 URL: http://www.polstra.com/projects/freeware/CVSup/
 License: BSD
@@ -16,12 +16,29 @@
 Source1: cvsupd.rc
 Source2: cvsupd.logrotate
 Source3: cvsupd.conf
-Source4: ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ezm3/ezm3-1.1-src.tar.bz2
-Source5: ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ezm3/ezm3-1.1-LINUXLIBC6-boot.tar.bz2
+Source4: ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ezm3/ezm3-1.2-src.tar.bz2
+Source5: ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ezm3/ezm3-1.2-LINUXLIBC6-boot.tar.bz2
+Source6: http://dev.gentoo.org/~vapier/ezm3/1.2/ezm3-1.2-PPC_LINUX-boot.tar.bz2
 Patch0: cvsup-contrib.patch
-Patch1: cvsup-no-rpath.diff
+Patch1: cvsup-ppc.patch
+Patch2: cvsup-no-rpath.diff
+Patch3: http://dev.gentoo.org/~vapier/ezm3/1.2/ezm3-1.2-PPC_LINUX.patch.bz2
+# This is a hack...
+Patch4: ezm3-1.2-PPC-setjmp-bootstrap.patch
+Patch5: ezm3-1.2-PPC-setjmp.patch
+# ... and this should be the real fix. Unfortunately it doesn't work..
+Patch6: ezm3-1.2-ppc-jmpbufsize.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: mktemp, sed, XFree86-devel, zlib-devel
+ExclusiveArch: i386 ppc
+
+%ifarch i386
+%define M3TARGET LINUXLIBC6
+%endif
+%ifarch ppc
+%define M3TARGET PPC_LINUX
+%endif
 
 %package -n cvsup-contrib
 Summary: CVSup user contributed helper tools
@@ -69,10 +86,17 @@
 %setup -q -n %{name}-snap-%{snapver}
 %setup -q -T -D -a 4 -n %{name}-snap-%{snapver}
 %setup -q -T -D -a 5 -n %{name}-snap-%{snapver}
+%setup -q -T -D -a 6 -n %{name}-snap-%{snapver}
 
 %patch
 %patch1 -p1
-
+pushd ezm3-1.2
+%patch2 -p2
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+#%patch6 -p1
+popd
 
 %build
 # ------------------------- Begin hackery ------------------------- #
@@ -91,9 +115,9 @@
     exit 1
 fi
 sed -e "s|INSTALL_ROOT.*|INSTALL_ROOT = \"${m3dir}\"|" \
-    < %{m3name}-%{m3ver}/m3config/src/LINUXLIBC6 > $TMPFILE
-mv $TMPFILE %{m3name}-%{m3ver}/m3config/src/LINUXLIBC6
-(cd %{m3name}-%{m3ver}; make BISON=yacc)
+    < %{m3name}-%{m3ver}/m3config/src/%{M3TARGET} > $TMPFILE
+mv $TMPFILE %{m3name}-%{m3ver}/m3config/src/%{M3TARGET}
+(cd %{m3name}-%{m3ver}; make BISON=yacc -f Makefile.%{M3TARGET})
 # ------------------------- End hackery ------------------------------ #
 # Now build cvsup -- whew!
 make PREFIX=%{_prefix} %{?_smp_mflags}
@@ -179,6 +203,9 @@
 %doc Acknowledgments Announce Blurb ChangeLog Install License doc examples
 
 %changelog
+* Sun Feb 13 2005 David Woodhouse <dwmw2 at infradead.org> - 0.16.1-7h
+- Add PPC support. My brain hurts.
+
 * Sun Apr 18 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:16.1-0.fdr.6.h
 - Split (post,preun) into two to work around a bug in rpm.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cvsup/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:13:00 -0000	1.2
+++ sources	13 Feb 2005 02:48:53 -0000	1.3
@@ -1,3 +1,4 @@
 b100ace98a41aa9f3d3e75b0d3c245b0  cvsup-snap-16.1h.tar.gz
-f2efe85be7676944c537aa729f9cb17e  ezm3-1.1-LINUXLIBC6-boot.tar.bz2
-0cb8d2af3784142144c01ffac4c0ffff  ezm3-1.1-src.tar.bz2
+41ac38cc9a57d7498b2ce7705792e2d8  ezm3-1.2-src.tar.bz2
+1cecf4fea71a00a78387d148745193cb  ezm3-1.2-LINUXLIBC6-boot.tar.bz2
+26d5827409c749d42323a1f0c51e0018  ezm3-1.2-PPC_LINUX-boot.tar.bz2

More information about the scm-commits mailing list