summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2014-12-02 12:14:39 +0000
committerryoon <ryoon@pkgsrc.org>2014-12-02 12:14:39 +0000
commit1d41241778efc488040f1b0bd5cd24f7a43759dc (patch)
tree05305340ec46911a258db7ecc36d25b43b8c49b2 /www
parent97173da02d2530ab0988af6ffd1d877936b186fe (diff)
downloadpkgsrc-1d41241778efc488040f1b0bd5cd24f7a43759dc.tar.gz
Fix build under NetBSD/evbearmv7hf-el.
Remove two more unwind directives.
Diffstat (limited to 'www')
-rw-r--r--www/firefox/distinfo4
-rw-r--r--www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp6
2 files changed, 4 insertions, 6 deletions
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 86aab1f88ae..70e4559557f 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.173 2014/12/01 18:11:14 ryoon Exp $
+$NetBSD: distinfo,v 1.174 2014/12/02 12:14:39 ryoon Exp $
SHA1 (firefox-34.0.5.source.tar.bz2) = 33654d38268d1d1f71105f48bbe97cf720f47be2
RMD160 (firefox-34.0.5.source.tar.bz2) = a246a94fe7c921a732b64034b6ff0d5164628e5f
@@ -163,7 +163,7 @@ SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp) = 8cb7
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp) = b6dc5d54eeaa908d914116429e61f4b65a6a5f8e
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp) = 71a33723a557a6153405f6baec8404b25f841608
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp) = 0792c2c626d906e71c5183994cb32bf8cdb3e239
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp) = bb0c80db483776fc07682e5939b652578f33eb17
+SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp) = 3a902eb9a23b3b5737f3c8cb5f96a5ad9a98a189
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S) = 79a4686d368132aff804f217baa685b2e06bc396
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s) = 522bc237bc90d85c98b61a467a431fddd91d8c3c
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp) = d246f0695eb43d43bfd5571297945a4b7a88f72c
diff --git a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp
index 040fd6b3858..d1fb41d9a93 100644
--- a/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp
+++ b/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp,v 1.3 2014/12/01 18:11:14 ryoon Exp $
+$NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp,v 1.4 2014/12/02 12:14:40 ryoon Exp $
--- xpcom/reflect/xptcall/md/unix/xptcstubs_arm_netbsd.cpp.orig 2014-11-26 12:30:27.000000000 +0000
+++ xpcom/reflect/xptcall/md/unix/xptcstubs_arm_netbsd.cpp
@@ -82,7 +82,7 @@ $NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp,v 1.3 20
if(dispatchParams != paramBuffer)
delete [] dispatchParams;
-@@ -82,26 +95,116 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -82,26 +95,114 @@ PrepareAndDispatch(nsXPTCStubBase* self,
}
/*
@@ -122,14 +122,12 @@ $NetBSD: patch-xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp,v 1.3 20
+ "SharedStub:\n"
+ CFI(".cfi_startproc\n")
+ "stmfd sp!, {r1, r2, r3}\n"
-+ ".save {r1, r2, r3}\n"
+ CFI(".cfi_def_cfa_offset 12\n")
+ CFI(".cfi_offset r3, -4\n")
+ CFI(".cfi_offset r2, -8\n")
+ CFI(".cfi_offset r1, -12\n")
+ "mov r2, sp\n"
+ "str lr, [sp, #-4]!\n"
-+ ".save {lr}\n"
+ CFI(".cfi_def_cfa_offset 16\n")
+ CFI(".cfi_offset lr, -16\n")
+ "mov r1, ip\n"