diff -Nru qt4-x11-4.8.7+dfsg/debian/changelog qt4-x11-4.8.7+dfsg/debian/changelog
--- qt4-x11-4.8.7+dfsg/debian/changelog	2019-04-12 20:10:28.000000000 +0000
+++ qt4-x11-4.8.7+dfsg/debian/changelog	2019-04-15 12:36:18.000000000 +0000
@@ -1,3 +1,13 @@
+qt4-x11 (4:4.8.7+dfsg-18+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 4:4.8.6+git64-g5dc8b2b+dfsg-2+rpi1 by Peter Micheal Green <plugwash@raspbian.org> at Thu, 31 Jul 2014 22:56:54 +0000]
+  * Disable neon
+
+  [changes brought forward from 4:4.8.7+dfsg-17+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 14 Apr 2019 10:25:37 +0000]
+  * Replace a number of occourances of "asm" with "__asm"
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 15 Apr 2019 12:36:18 +0000
+
 qt4-x11 (4:4.8.7+dfsg-18) unstable; urgency=medium
 
   * Team upload.
diff -Nru qt4-x11-4.8.7+dfsg/debian/patches/add-underscores-to-asm.patch qt4-x11-4.8.7+dfsg/debian/patches/add-underscores-to-asm.patch
--- qt4-x11-4.8.7+dfsg/debian/patches/add-underscores-to-asm.patch	1970-01-01 00:00:00.000000000 +0000
+++ qt4-x11-4.8.7+dfsg/debian/patches/add-underscores-to-asm.patch	2019-04-15 12:36:18.000000000 +0000
@@ -0,0 +1,47 @@
+Description: add underscores to asm.
+ Add underscores to some uses of "asm", so they will work even in "standard"
+ compiler modes.
+
+ I'm not sure what exactly has triggered the need for this (different flags,
+ different compiler, different paths through the ifdefs, but the easiest
+ soloution is just to fix it.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- qt4-x11-4.8.7+dfsg.orig/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
++++ qt4-x11-4.8.7+dfsg/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
+@@ -614,7 +614,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "
+ 
+ #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL)
+ 
+-asm volatile (
++__asm volatile (
+ ".text\n"
+ ".globl " SYMBOL_STRING(ctiTrampoline) "\n"
+ HIDE_SYMBOL(ctiTrampoline) "\n"
+@@ -632,7 +632,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n"
+     "mov pc, lr" "\n"
+ );
+ 
+-asm volatile (
++__asm volatile (
+ ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n"
+ HIDE_SYMBOL(ctiVMThrowTrampoline) "\n"
+ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
+@@ -1024,7 +1024,7 @@ static NEVER_INLINE void throwStackOverf
+     extern "C" { \
+         rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \
+     }; \
+-    asm volatile ( \
++    __asm volatile ( \
+         ".text" "\n" \
+         ".align 2" "\n" \
+         ".globl " SYMBOL_STRING(cti_##op) "\n" \
+@@ -1053,7 +1053,7 @@ COMPILE_ASSERT(offsetof(struct JITStackF
+     extern "C" { \
+         rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \
+     }; \
+-    asm volatile ( \
++    __asm volatile ( \
+         ".globl " SYMBOL_STRING(cti_##op) "\n" \
+         HIDE_SYMBOL(cti_##op) "\n"             \
+         SYMBOL_STRING(cti_##op) ":" "\n" \
diff -Nru qt4-x11-4.8.7+dfsg/debian/patches/series qt4-x11-4.8.7+dfsg/debian/patches/series
--- qt4-x11-4.8.7+dfsg/debian/patches/series	2019-04-12 20:10:28.000000000 +0000
+++ qt4-x11-4.8.7+dfsg/debian/patches/series	2019-04-15 12:36:18.000000000 +0000
@@ -72,3 +72,4 @@
 openssl_1.1.patch
 riscv64-support.patch
 fix-build-icu59.patch
+add-underscores-to-asm.patch
diff -Nru qt4-x11-4.8.7+dfsg/debian/rules qt4-x11-4.8.7+dfsg/debian/rules
--- qt4-x11-4.8.7+dfsg/debian/rules	2019-04-12 20:10:28.000000000 +0000
+++ qt4-x11-4.8.7+dfsg/debian/rules	2019-04-15 12:36:18.000000000 +0000
@@ -51,7 +51,7 @@
 
 armv6_architectures := armhf
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(armv6_architectures)))
-	extra_configure_opts += -arch armv6
+	extra_configure_opts += -arch armv6 -no-neon
 endif
 
 ifeq ($(vendor),Ubuntu)