update Fri Jun 18 12:37:00 PDT 2010

diff --git a/wip/erlang/distinfo b/wip/erlang/distinfo
index 9c89670..726d816 100644 (file)
--- a/wip/erlang/distinfo
+++ b/wip/erlang/distinfo
@@ -19,8 +19,9 @@ SHA1 (patch-an) = 50a33207affe4831ee107bc80eb37957a0a96973
 SHA1 (patch-ao) = 6cf2128cab7402bbe02553724db6da7b1c2b6684
 SHA1 (patch-ap) = 0962f1f8ce99c2010cbe03ac00c2d0187fcbecdf
 SHA1 (patch-ar) = da70a4889ddca453d70e0e74019e60c29ac31e1b
-SHA1 (patch-as) = 3ec34b93cb37dfebbf24fb531e1ddcb4e1a91fef
+SHA1 (patch-as) = 89e244dc2d902b02cb89c44c17b12675de76977e
 SHA1 (patch-at) = 8d4831db4e245f31bfd5db0468344c410b34c41d
 SHA1 (patch-au) = fe924a3306a278f51d10b1d2ad14432ec9f1428e
 SHA1 (patch-av) = 3c0a446177036cb2875d68dbf35d265879c032bb
 SHA1 (patch-aw) = 38c5dbe389c0ec8e0bea16b99f56ddc1dc4c581e
+SHA1 (patch-ax) = 646cd538eb828547e540c215a145fe22b078792f

diff --git a/wip/erlang/patches/patch-as b/wip/erlang/patches/patch-as
index d8c1bd0..cfb064e 100644 (file)
--- a/wip/erlang/patches/patch-as
+++ b/wip/erlang/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.1 2009/12/15 12:09:20 asau Exp $
+$NetBSD$
 
---- erts/emulator/sys/unix/sys_float.c.orig    2010-02-19 20:04:07.000000000 +0200
-+++ erts/emulator/sys/unix/sys_float.c 2010-02-24 14:43:43.000000000 +0200
-@@ -476,7 +476,7 @@
+--- erts/emulator/sys/unix/sys_float.c.orig    2010-02-19 18:04:07.000000000 +0000
++++ erts/emulator/sys/unix/sys_float.c
+@@ -476,7 +476,7 @@ static int mask_fpe(void)
  
  #endif
  
@@ -11,17 +11,35 @@ $NetBSD: patch-as,v 1.1 2009/12/15 12:09:20 asau Exp $
  
  #if defined(__linux__) && defined(__i386__)
  #if !defined(X86_FXSR_MAGIC)
-@@ -519,6 +519,9 @@
+@@ -519,6 +519,11 @@ static int mask_fpe(void)
  #define mc_pc(mc)     ((mc)->mc_rip)
  #elif defined(__FreeBSD__) && defined(__i386__)
  #define mc_pc(mc)     ((mc)->mc_eip)
++#elif defined(__NetBSD__) && defined(__i386__)
++#define mc_pc(mc)     ((mc)->__gregs[_REG_EIP])
 +#elif defined(__NetBSD__) && defined(__x86_64__)
 +#define mc_pc(mc)     ((mc)->__gregs[_REG_RIP])
 +typedef mcontext_t *erts_mcontext_ptr_t;
  #elif defined(__OpenBSD__) && defined(__x86_64__)
  #define mc_pc(mc)     ((mc)->sc_rip)
  #elif defined(__sun__) && defined(__x86_64__)
-@@ -615,6 +618,14 @@
+@@ -610,11 +615,30 @@ static void fpe_sig_action(int sig, sigi
+       struct env87 *env87 = &savefpu->sv_87.sv_env;
+       env87->en_sw &= ~0xFF;
+     }
++#elif defined(__NetBSD__) && defined(__i386__)
++    mcontext_t *mc = &uc->uc_mcontext;
++    pc = mc_pc(mc);
++    if (uc->uc_flags & _UC_FXSAVE) {
++      struct envxmm *envxmm = (struct envxmm *)&mc->__fpregs;
++      envxmm->en_mxcsr = 0x1F80;
++      envxmm->en_sw &= ~0xFF;
++    } else {
++      struct env87 *env87 = (struct env87 *)&mc->__fpregs;
++      env87->en_sw &= ~0xFF;
++    }
+ #elif defined(__OpenBSD__) && defined(__x86_64__)
+     struct fxsave64 *fxsave = uc->sc_fpstate;
      pc = mc_pc(uc);
      fxsave->fx_mxcsr = 0x1F80;
      fxsave->fx_fsw &= ~0xFF;

diff --git a/wip/erlang/patches/patch-ax b/wip/erlang/patches/patch-ax
new file mode 100644 (file)
index 0000000..b7c7ca3
--- /dev/null
+++ b/wip/erlang/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- lib/mnesia/test/Makefile.orig      2009-03-12 12:27:42.000000000 +0000
++++ lib/mnesia/test/Makefile
+@@ -109,7 +109,7 @@ release_spec: opt
+ release_tests_spec: opt
+       $(INSTALL_DIR) $(RELSYSDIR)
+       $(INSTALL_DATA) mnesia.spec mnesia.spec.vxworks $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)
+-      $(INSTALL_PROGRAM) mt $(INSTALL_PROGS) $(RELSYSDIR)
++      $(INSTALL_SCRIPT) mt $(INSTALL_PROGS) $(RELSYSDIR)
+ #     chmod -f -R u+w $(RELSYSDIR)
+ #     @tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
+ 

diff --git a/wip/task/patches/patch-aa b/wip/task/patches/patch-aa
deleted file mode 100644 (file)
index 2e03ac9..0000000
--- a/wip/task/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
---- configure.orig     2010-02-22 20:49:27.000000000 +0000
-+++ configure
-@@ -3376,7 +3376,7 @@ else
- fi
- 
- 
--if test "x$with_ncurses" == "xyes" ; then
-+if test "x$with_ncurses" = "xyes" ; then
- 
- $as_echo "#define HAVE_LIBNCURSES 1" >>confdefs.h
- 
-@@ -3448,7 +3448,7 @@ fi
- #            [readline_lib=$withval],
- #            [readline_lib=''])
- #
--#if test "x$with_readline" == "xyes" ; then
-+#if test "x$with_readline" = "xyes" ; then
- #  AC_DEFINE([HAVE_LIBREADLINE], [1], [Defined if you have libreadline])
- #  if test -n "$readline_inc"; then
- #    CFLAGS="$CFLAGS -I$readline_inc"
-@@ -3491,7 +3491,7 @@ else
- fi
- 
- 
--if test "x$with_lua" == "xyes" ; then
-+if test "x$with_lua" = "xyes" ; then
- 
- $as_echo "#define HAVE_LIBLUA 1" >>confdefs.h
-