[MLton] Re: [MLton-commit] r7248 -- IA64 changes

[Matthew Fluet]

Ville ought to vette these changes (to the gcc flags passed on an IA64 
architecture), since he made the initial port (for ia64-hpux).  Is 
'-mlp64' the default mode (and, so the flag was redundant)?

On Tue, 13 Oct 2009, Wesley Terpstra wrote:
> God that port was easy. IA64 works. :)
>
> ----------------------------------------------------------------------
>
> U   mlton/trunk/bin/mlton-script
> U   mlton/trunk/package/debian/control
> U   mlton/trunk/runtime/Makefile
> U   mlton/trunk/runtime/platform/linux.c
>
> ----------------------------------------------------------------------
>
> Modified: mlton/trunk/bin/mlton-script
> ===================================================================
> --- mlton/trunk/bin/mlton-script	2009-10-13 13:12:41 UTC (rev 7247)
> +++ mlton/trunk/bin/mlton-script	2009-10-13 13:54:00 UTC (rev 7248)
> @@ -109,7 +109,7 @@
>         -target-cc-opt netbsd '-I/usr/pkg/include'               \
>         -target-cc-opt openbsd '-I/usr/local/include'            \
>         -target-cc-opt aix '-maix64'                             \
> -        -target-cc-opt ia64 '-mlp64 -mtune=itanium2'             \
> +        -target-cc-opt ia64 '-mtune=itanium2'                    \
>         -target-cc-opt sparc '-m32 -mcpu=v8 -Wa,-xarch=v8plusa'  \
>         -target-cc-opt x86                                       \
>                 '-m32
>
> Modified: mlton/trunk/package/debian/control
> ===================================================================
> --- mlton/trunk/package/debian/control	2009-10-13 13:12:41 UTC (rev 7247)
> +++ mlton/trunk/package/debian/control	2009-10-13 13:54:00 UTC (rev 7248)
> @@ -6,7 +6,7 @@
> Standards-Version: 3.7.2
>
> Package: mlton
> -Architecture: amd64 hppa i386 powerpc s390 sparc
> +Architecture: amd64 hppa i386 ia64 powerpc s390 sparc
> Depends: ${shlibs:Depends}, gcc, libc6-dev, libgmp3-dev (>= 4.0.1)
> Description: Optimizing compiler for Standard ML
>  MLton (mlton.org) is a whole-program optimizing
>
> Modified: mlton/trunk/runtime/Makefile
> ===================================================================
> --- mlton/trunk/runtime/Makefile	2009-10-13 13:12:41 UTC (rev 7247)
> +++ mlton/trunk/runtime/Makefile	2009-10-13 13:54:00 UTC (rev 7248)
> @@ -69,7 +69,7 @@
> endif
>
> ifeq ($(TARGET_ARCH), ia64)
> -FLAGS += -mlp64 -mtune=itanium2
> +FLAGS += -mtune=itanium2
> endif
>
> ifeq ($(TARGET_OS)-$(TARGET_ARCH), aix-powerpc64)
>
> Modified: mlton/trunk/runtime/platform/linux.c
> ===================================================================
> --- mlton/trunk/runtime/platform/linux.c	2009-10-13 13:12:41 UTC (rev 7247)
> +++ mlton/trunk/runtime/platform/linux.c	2009-10-13 13:54:00 UTC (rev 7248)
> @@ -15,7 +15,6 @@
>
> /* potentially correct for other archs:
>  *  alpha: ucp->m_context.sc_pc
> - *  ia64: ucp->m_context.sc_ip & ~0x3UL
>  */
> static void catcher (__attribute__ ((unused)) int sig,
>                      __attribute__ ((unused)) siginfo_t* sip,
> @@ -30,6 +29,9 @@
> #elif (defined (__hppa__))
>         ucontext_t* ucp = (ucontext_t*)mystery;
>         GC_handleSigProf ((code_pointer) (ucp->uc_mcontext.sc_iaoq[0] & ~0x3UL));
> +#elif (defined(__ia64__))
> +        ucontext_t* ucp = (ucontext_t*)mystery;
> +        GC_handleSigProf ((code_pointer) ucp->_u._mc.sc_ip);
> #elif (defined (__ppc__)) || (defined (__powerpc__))
>         ucontext_t* ucp = (ucontext_t*)mystery;
>         GC_handleSigProf ((code_pointer) ucp->uc_mcontext.regs->nip);
>
>
> _______________________________________________
> MLton-commit mailing list
> MLton-commit at mlton.org
> http://mlton.org/mailman/listinfo/mlton-commit
>