Package: iceweasel
Version: 5.0-4
Severity: serious
Tags: patch
According to the build log:
http://buildd.debian-ports.org/status/fetch.php?pkg=iceweasel&arch=armhf&ver=5.0-4&stamp=1311411735
iceweasel 5.0 (and 6.0 in experimental) break on armhf. The reason is
the fix for armel in
porting/Fix-FTBFS-in-xpcom-base-on-armv4t.patch
diff --git a/xpcom/base/nsDebugImpl.cpp b/xpcom/base/nsDebugImpl.cpp
index f26f97b..353c1e4 100644
--- a/xpcom/base/nsDebugImpl.cpp
+++ b/xpcom/base/nsDebugImpl.cpp
@@ -402,7 +402,9 @@ RealBreak()
#elif defined(__GNUC__) && (defined(__i386__) || defined(__i386) ||
defined(__x86_64__))
asm("int $3");
#elif defined(__arm__)
- asm("BKPT #0");
+ asm(".arch armv5t\n"
+ ".object_arch armv4t\n"
+ "BKPT #0");
#elif defined(SOLARIS)
#if defined(__i386__) || defined(__i386) || defined(__x86_64__)
asm("int $3");
This totally breaks asm generation on newer arm cpus. The attached
patch fixes the build for armhf. Please apply.
Regards
Konstantinos
--- iceweasel-5.0.orig/xpcom/base/nsDebugImpl.cpp 2011-07-29 18:38:38.000000000 +0000
+++ iceweasel-5.0/xpcom/base/nsDebugImpl.cpp 2011-07-29 18:32:45.751357037 +0000
@@ -402,9 +402,13 @@
#elif defined(__GNUC__) && (defined(__i386__) || defined(__i386) || defined(__x86_64__))
asm("int $3");
#elif defined(__arm__)
+#if defined(__ARM_ARCH_7A__)
+ asm("BKPT #0");
+#else
asm(".arch armv5t\n"
".object_arch armv4t\n"
"BKPT #0");
+#endif
#elif defined(SOLARIS)
#if defined(__i386__) || defined(__i386) || defined(__x86_64__)
asm("int $3");
