Bug#730830: ocaml: Please add powerpcspe to the list of native architectures

[Roland Stigge <stigge@antcom.de>]

Source: ocaml
Version: 3.12.1-4
Severity: wishlist
Tags: patch sid
User: debian-powerpcspe@breakpoint.cc
Usertags: powerpcspe

Hi,

please add powerpcspe to the list of native architectures. I.e., add
"powerpcspe" to:

* debian/native-archs
* debian/natdynlink-archs
* debian/control

similar as powerpc.

I'm attaching a patch that fixes an asm build problem on powerpcspe since some
CPU registers don't exist on powerpcspe, so they can't be saved and restored.

Further, please add libiberty-dev to the build-deps since this prevents a build
error.

Thanks in advance,

Roland

-- System Information:
Debian Release: 7.0
  APT prefers unreleased
  APT policy: (500, 'unreleased'), (500, 'unstable')
Architecture: powerpcspe (ppc)

Kernel: Linux 3.9.0-dirty (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/dash

--- ocaml-3.12.1.orig/asmrun/power-elf.S
+++ ocaml-3.12.1/asmrun/power-elf.S
@@ -72,6 +72,7 @@ caml_call_gc:
         stwu    27, 4(11)
         stwu    28, 4(11)
         addi    11, 1, 32 - 8
+#ifndef __NO_FPRS__
         stfdu   1, 8(11)
         stfdu   2, 8(11)
         stfdu   3, 8(11)
@@ -103,6 +104,7 @@ caml_call_gc:
         stfdu   29, 8(11)
         stfdu   30, 8(11)
         stfdu   31, 8(11)
+#endif
     /* Call the GC */
         bl      caml_garbage_collection
     /* Reload new allocation pointer and allocation limit */
@@ -134,6 +136,7 @@ caml_call_gc:
         lwzu    27, 4(11)
         lwzu    28, 4(11)
         addi    11, 1, 32 - 8
+#ifndef __NO_FPRS__
         lfdu    1, 8(11)
         lfdu    2, 8(11)
         lfdu    3, 8(11)
@@ -165,6 +168,7 @@ caml_call_gc:
         lfdu    29, 8(11)
         lfdu    30, 8(11)
         lfdu    31, 8(11)
+#endif
     /* Return to caller, restarting the allocation */
         Loadglobal(0, caml_last_return_address, 11)
         addic   0, 0, -16     /* Restart the allocation (4 instructions) */
@@ -261,6 +265,7 @@ caml_start_program:
         stwu    29, 4(11)
         stwu    30, 4(11)
         stwu    31, 4(11)
+#ifndef __NO_FPRS__
         stfdu   14, 8(11)
         stfdu   15, 8(11)
         stfdu   16, 8(11)
@@ -279,6 +284,7 @@ caml_start_program:
         stfdu   29, 8(11)
         stfdu   30, 8(11)
         stfdu   31, 8(11)
+#endif
     /* Set up a callback link */
         addi    1, 1, -16
         Loadglobal(9, caml_bottom_of_stack, 11)
@@ -342,6 +348,7 @@ caml_start_program:
         lwzu    29, 4(11)
         lwzu    30, 4(11)
         lwzu    31, 4(11)
+#ifndef __NO_FPRS__
         lfdu    14, 8(11)
         lfdu    15, 8(11)
         lfdu    16, 8(11)
@@ -360,6 +367,7 @@ caml_start_program:
         lfdu    29, 8(11)
         lfdu    30, 8(11)
         lfdu    31, 8(11)
+#endif
     /* Reload return address */
         lwz     0, 256+4(1)
         mtlr    0