From 1bb208ba9c17efa384af4530659ce0b086e2ada6 Mon Sep 17 00:00:00 2001 From: adrianp Date: Sat, 5 Feb 2005 00:26:18 +0000 Subject: fix broken patch from last update - ride the recent update --- lang/ocaml/distinfo | 4 ++-- lang/ocaml/patches/patch-ah | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 6a44c222c05..5193aab2426 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.22 2005/02/05 00:04:20 adrianp Exp $ +$NetBSD: distinfo,v 1.23 2005/02/05 00:26:18 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) = 0d24e2e9234532381f1abdc8336fee87a05530b8 +SHA1 (patch-ah) = ac75abf66f6cb07dfb2f0a0e24a4064a16db140e 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 55537ec6dda..6a41b969d28 100644 --- a/lang/ocaml/patches/patch-ah +++ b/lang/ocaml/patches/patch-ah @@ -1,10 +1,10 @@ -$NetBSD: patch-ah,v 1.8 2005/02/05 00:04:20 adrianp Exp $ +$NetBSD: patch-ah,v 1.9 2005/02/05 00:26:18 adrianp Exp $ ---- asmrun/power-bsd.S.orig 2005-02-04 23:36:22.000000000 +0000 -+++ asmrun/power-bsd.S 2005-02-04 23:42:19.000000000 +0000 +--- 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 @@ -13,6 +13,35 @@ - /* $Id: patch-ah,v 1.8 2005/02/05 00:04:20 adrianp Exp $ */ + /* $Id: patch-ah,v 1.9 2005/02/05 00:26:18 adrianp Exp $ */ +#if defined(PROFILING) +#define PROFILE_CAML \ @@ -17,23 +17,23 @@ $NetBSD: patch-ah,v 1.8 2005/02/05 00:04:20 adrianp Exp $ + stw 5, 20(1) \ + stw 6, 24(1) \ + stw 7, 28(1) \ -+ bl _mcount \ -+ lwz 2, 8(1) \ -+ lwz 3, 12(1) \ -+ lwz 4, 16(1) \ -+ lwz 5, 20(1) \ -+ lwz 6, 24(1) \ ++ bl _mcount \ ++ lwz 2, 8(1) \ ++ lwz 3, 12(1) \ ++ lwz 4, 16(1) \ ++ lwz 5, 20(1) \ ++ lwz 6, 24(1) \ + lwz 7, 28(1) \ + addic 1, 1, 32 + +#define PROFILE_C \ + mflr 0 \ -+ stw 0, 4(1) \ -+ bl _mcount -+#else -+#define PROFILE_CAML -+#define PROFILE_C -+#endif ++ stw 0, 4(1) \ ++ bl _mcount ++#else ++#define PROFILE_CAML ++#define PROFILE_C ++#endif + #define Addrglobal(reg,glob) \ addis reg, 0, glob@ha; \ -- cgit v1.2.3