rpms/mlton/devel mlton-20070826-arm.patch, NONE, 1.1 mlton.spec, 1.27, 1.28

[Adam Goode]

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14143

Modified Files:
	mlton.spec 
Added Files:
	mlton-20070826-arm.patch 
Log Message:
* Tue May 26 2009 Adam Goode <adam at spicenitz.org> - 20070826-16
- Add missing ARM patch


mlton-20070826-arm.patch:

--- NEW FILE mlton-20070826-arm.patch ---
diff --git a/runtime/basis/Word/Word.c b/runtime/basis/Word/Word.c
index 39f6d05..651c426 100644
--- a/runtime/basis/Word/Word.c
+++ b/runtime/basis/Word/Word.c
@@ -24,7 +24,7 @@
  * implements / and %.
  */
 
-#if ! (defined (__amd64__) || defined (__hppa__) || defined (__i386__) || defined(__ia64__)|| defined (__ppc__) || defined (__powerpc__) || defined (__sparc__))
+#if ! (defined (__amd64__) || defined (__hppa__) || defined (__i386__) || defined(__ia64__)|| defined (__ppc__) || defined (__powerpc__) || defined (__sparc__) || defined (__arm__))
 #error check that C {/,%} correctly implement {quot,rem} from the basis library
 #endif
 
diff --git a/runtime/platform/linux.c b/runtime/platform/linux.c
index 3177ed1..fecf168 100644
--- a/runtime/platform/linux.c
+++ b/runtime/platform/linux.c
@@ -17,7 +17,6 @@
 
 /* potentially correct for other archs:
  *  alpha: ucp->m_context.sc_pc
- *  arm: ucp->m_context.ctx.arm_pc
  *  ia64: ucp->m_context.sc_ip & ~0x3UL
  *  mips: ucp->m_context.sc_pc
  *  s390: ucp->m_context.sregs->regs.psw.addr
@@ -48,6 +47,9 @@ static void catcher (__attribute__ ((unused)) int sig,
 #elif (defined (__i386__))
         ucontext_t* ucp = (ucontext_t*)mystery;
         GC_handleSigProf ((code_pointer) ucp->uc_mcontext.gregs[EIP]);
+#elif (defined (__arm__))
+        ucontext_t* ucp = (ucontext_t*)mystery;
+        GC_handleSigProf ((code_pointer) ucp->uc_mcontext.arm_pc);
 #else
 #error Profiling handler is missing for this architecture
 #endif


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- mlton.spec	27 May 2009 01:46:35 -0000	1.27
+++ mlton.spec	27 May 2009 01:54:17 -0000	1.28
@@ -2,7 +2,7 @@
 
 Name:		mlton
 Version:	20070826
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 26 2009 Adam Goode <adam at spicenitz.org> - 20070826-16
+- Add missing ARM patch
+
 * Tue May 26 2009 Adam Goode <adam at spicenitz.org> - 20070826-15
 - Bootstrap ARM