- Fix for patch-ah on Darwin, problem spotted by Antoine Reilles in

  private email.

2 files changed, 13 insertions, 43 deletions

diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 4caf55ed3be..c35c1e886d1 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.24 2005/02/05 00:49:34 wiz Exp $
+$NetBSD: distinfo,v 1.25 2005/02/06 15:25:35 adrianp Exp $
 
 SHA1 (ocaml-3.08.2.tar.gz) = dc0d1ea4bbf0fb714b693621ec7f0b6cfd4eb354
 Size (ocaml-3.08.2.tar.gz) = 2437387 bytes
 SHA1 (patch-aa) = 29b692a7987fb886f5159b2b95044c7e0f2ef76b
 SHA1 (patch-ac) = b8920fe365e02d2db3fee53afdce368af98941e3
-SHA1 (patch-ah) = 9d8b48bed7bd37bd92eaa72ec4da7a6531257204
+SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488
 SHA1 (patch-ai) = a63857c935bf09a9c8d621aa67ef3a13ca4bbd20
 SHA1 (patch-aj) = e2b0cec6eede0eaee928fdf222fad46d64f648c1
 SHA1 (patch-ak) = 3d87b50076c00f1ffa14754824e783949c2a57a9
diff --git a/lang/ocaml/patches/patch-ah b/lang/ocaml/patches/patch-ah
index 920ce68834c..e8af5b1a44d 100644
--- a/lang/ocaml/patches/patch-ah
+++ b/lang/ocaml/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.10 2005/02/05 00:49:34 wiz Exp $
+$NetBSD: patch-ah,v 1.11 2005/02/06 15:25:36 adrianp Exp $
 
---- asmrun/power-bsd.S.orig	2005-02-05 00:20:14.000000000 +0000
-+++ asmrun/power-bsd.S	2005-02-05 00:22:01.000000000 +0000
-@@ -15,4 +15,33 @@
+--- asmrun/power-bsd.S.orig	2005-02-06 15:00:21.000000000 +0000
++++ asmrun/power-bsd.S
+@@ -15,2 +15,31 @@
  
 +#if defined(PROFILING)
 +#define PROFILE_CAML \
@@ -34,61 +34,31 @@ $NetBSD: patch-ah,v 1.10 2005/02/05 00:49:34 wiz Exp $
 +#endif                              
 +
  #define Addrglobal(reg,glob) \
-         addis   reg, 0, glob@ha; \
-         addi    reg, reg, glob@l
-@@ -30,6 +59,7 @@
-         .globl  caml_call_gc
-         .type   caml_call_gc, @function
+@@ -32,2 +61,3 @@
  caml_call_gc:
 +        PROFILE_CAML
      /* Set up stack frame */
-         stwu    1, -0x1A0(1)
-     /* 0x1A0 = 4*32 (int regs) + 8*32 (float regs) + 32 (space for C call) */
-@@ -182,6 +212,7 @@
-         .globl  caml_c_call
-         .type   caml_c_call, @function
+@@ -184,2 +214,3 @@ caml_call_gc:
  caml_c_call:
 +        PROFILE_CAML
      /* Save return address */
-         mflr    25
-     /* Get ready to call C function (address in 11) */
-@@ -210,6 +241,7 @@
-         .globl  caml_raise_exception
-         .type   caml_raise_exception, @function
+@@ -212,2 +243,3 @@ caml_c_call:
  caml_raise_exception:
 +        PROFILE_C
      /* Reload Caml global registers */
-         Loadglobal(1, caml_exception_pointer, 11)
-         Loadglobal(31, caml_young_ptr, 11)
-@@ -230,6 +262,7 @@
-         .globl  caml_start_program
-         .type   caml_start_program, @function
+@@ -232,2 +264,3 @@ caml_raise_exception:
  caml_start_program:
 +        PROFILE_C
          Addrglobal(12, caml_program)
- 
- /* Code shared between caml_start_program and caml_callback */
-@@ -380,6 +413,7 @@
-         .globl  caml_callback_exn
-         .type   caml_callback_exn, @function
+@@ -382,2 +415,3 @@ caml_start_program:
  caml_callback_exn:
 +        PROFILE_C
      /* Initial shuffling of arguments */
-         mr      0, 3            /* Closure */
-         mr      3, 4            /* Argument */
-@@ -390,6 +424,7 @@
-         .globl  caml_callback2_exn
-         .type   caml_callback2_exn, @function
+@@ -392,2 +426,3 @@ caml_callback_exn:
  caml_callback2_exn:
 +        PROFILE_C
          mr      0, 3            /* Closure */
-         mr      3, 4            /* First argument */
-         mr      4, 5            /* Second argument */
-@@ -400,6 +435,7 @@
-         .globl  caml_callback3_exn
-         .type   caml_callback3_exn, @function
+@@ -402,2 +437,3 @@ caml_callback2_exn:
  caml_callback3_exn:
 +        PROFILE_C
          mr      0, 3            /* Closure */
-         mr      3, 4            /* First argument */
-         mr      4, 5            /* Second argument */