From 009659f749ea9be4c9aadbd8cbcfffd36e1ab4fb Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Fri, 15 Apr 2011 08:31:48 +0000
Subject: [PATCH] - allow internal libffi to compile on mips64* by syncing
 patches with our libffi port.

ffx is not enabled on mips64* yet, though.

ok landry@
---
 .../patch-js_ctypes_libffi_src_mips_ffi_c     | 20 +++++++++++++++++++
 .../patch-js_src_ctypes_libffi_src_mips_ffi_c | 20 +++++++++++++++++++
 ...-js_src_ctypes_libffi_src_mips_ffitarget_h | 15 ++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 www/firefox36/patches/patch-js_ctypes_libffi_src_mips_ffi_c
 create mode 100644 www/mozilla-firefox/patches/patch-js_src_ctypes_libffi_src_mips_ffi_c
 create mode 100644 www/mozilla-firefox/patches/patch-js_src_ctypes_libffi_src_mips_ffitarget_h

diff --git a/www/firefox36/patches/patch-js_ctypes_libffi_src_mips_ffi_c b/www/firefox36/patches/patch-js_ctypes_libffi_src_mips_ffi_c
new file mode 100644
index 00000000000..a4f2bd13e03
--- /dev/null
+++ b/www/firefox36/patches/patch-js_ctypes_libffi_src_mips_ffi_c
@@ -0,0 +1,20 @@
+$OpenBSD: patch-js_ctypes_libffi_src_mips_ffi_c,v 1.1 2011/04/15 08:31:48 jasper Exp $
+
+Allow building this on OpenBSD, where we don't provide the ICACHE related
+defines in cachectl.h, but in sysarch.h.
+
+--- js/ctypes/libffi/src/mips/ffi.c.orig	Sat Mar 19 21:31:48 2011
++++ js/ctypes/libffi/src/mips/ffi.c	Fri Apr 15 10:11:49 2011
+@@ -37,7 +37,11 @@
+ #endif
+ 
+ #ifndef USE__BUILTIN___CLEAR_CACHE
+-#include <sys/cachectl.h>
++#  if defined(__OpenBSD__)
++#    include <mips64/sysarch.h>
++#  else
++#    include <sys/cachectl.h>
++#  endif
+ #endif
+ 
+ #ifdef FFI_DEBUG
diff --git a/www/mozilla-firefox/patches/patch-js_src_ctypes_libffi_src_mips_ffi_c b/www/mozilla-firefox/patches/patch-js_src_ctypes_libffi_src_mips_ffi_c
new file mode 100644
index 00000000000..ac0eedc39d9
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-js_src_ctypes_libffi_src_mips_ffi_c
@@ -0,0 +1,20 @@
+$OpenBSD: patch-js_src_ctypes_libffi_src_mips_ffi_c,v 1.1 2011/04/15 08:31:48 jasper Exp $
+
+Allow building this on OpenBSD, where we don't provide the ICACHE related
+defines in cachectl.h, but in sysarch.h.
+
+--- js/src/ctypes/libffi/src/mips/ffi.c.orig	Fri Apr 15 10:03:18 2011
++++ js/src/ctypes/libffi/src/mips/ffi.c	Fri Apr 15 10:03:36 2011
+@@ -37,7 +37,11 @@
+ #endif
+ 
+ #ifndef USE__BUILTIN___CLEAR_CACHE
+-#include <sys/cachectl.h>
++#  if defined(__OpenBSD__)
++#    include <mips64/sysarch.h>
++#  else
++#    include <sys/cachectl.h>
++#  endif
+ #endif
+ 
+ #ifdef FFI_DEBUG
diff --git a/www/mozilla-firefox/patches/patch-js_src_ctypes_libffi_src_mips_ffitarget_h b/www/mozilla-firefox/patches/patch-js_src_ctypes_libffi_src_mips_ffitarget_h
new file mode 100644
index 00000000000..47f965d020d
--- /dev/null
+++ b/www/mozilla-firefox/patches/patch-js_src_ctypes_libffi_src_mips_ffitarget_h
@@ -0,0 +1,15 @@
+$OpenBSD: patch-js_src_ctypes_libffi_src_mips_ffitarget_h,v 1.1 2011/04/15 08:31:48 jasper Exp $
+
+There's no sgidefs on OpenBSD, so don't bother including it.
+
+--- js/src/ctypes/libffi/src/mips/ffitarget.h.orig	Fri Apr 15 10:03:48 2011
++++ js/src/ctypes/libffi/src/mips/ffitarget.h	Fri Apr 15 10:04:04 2011
+@@ -29,7 +29,7 @@
+ 
+ #ifdef linux
+ # include <asm/sgidefs.h>
+-#else
++#elif !defined(__OpenBSD__)
+ # include <sgidefs.h>
+ #endif
+ #  ifndef _ABIN32