--- libstdc++-v3/src/nonshared98/decimal-rtti.S.orig	2015-08-12 20:56:16.881881601 +0100
+++ libstdc++-v3/src/nonshared98/decimal-rtti.S	2015-08-13 17:21:27.908566663 +0100
@@ -21,9 +21,11 @@
    <http://www.gnu.org/licenses/>.  */
 
 #if defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __ia64__ \
-    || defined __i386__ || defined __powerpc__ || defined __s390__
+    || defined __i386__ || defined __powerpc__ || defined __s390__ || defined __arm__
 #ifdef __i386__
 #define ALIGN1	.align 4
+#elif defined __arm__
+#define ALIGN1	.align 4
 #elif defined __x86_64__
 #define ALIGN1	.align 32
 #define ALIGN2	.align 16
@@ -31,7 +33,7 @@
 #define SYM(x)x#
 #define ALIGN1	.align 8
 #define ALIGN3	.align 8
-#define SECTION3(x).section .gnu.linkonce.s.x,"aws",@progbits
+#define SECTION3(x).section .gnu.linkonce.s.x,"aws",%progbits
 #define POINTER	data8
 #define FLAGS data4
 #define PAD .skip 4
@@ -42,7 +44,7 @@
 #elif defined __powerpc__
 #define ALIGN1	.align 2
 #define ALIGN3	.align 2
-#define SECTION2(x).section .gnu.linkonce.s.x,"aw",@progbits
+#define SECTION2(x).section .gnu.linkonce.s.x,"aw",%progbits
 #define SECTION3(x)SECTION2(x)
 #elif defined __s390x__
 #define ALIGN1	.align 8
@@ -88,13 +90,13 @@
 #define ALIGN3
 #endif
 #ifndef SECTION1
-#define SECTION1(x).section .gnu.linkonce.d.rel.ro.x,"aw",@progbits
+#define SECTION1(x).section .gnu.linkonce.d.rel.ro.x,"aw",%progbits
 #endif
 #ifndef SECTION2
 #define SECTION2(x)SECTION1(x)
 #endif
 #ifndef SECTION3
-#define SECTION3(x).section .gnu.linkonce.r.x,"a",@progbits
+#define SECTION3(x).section .gnu.linkonce.r.x,"a",%progbits
 #endif
 #ifndef STRING
 #define STRING .string
@@ -103,7 +105,7 @@
 	.weak	SYM(_ZTIPKDd)
 	SECTION1(_ZTIPKDd)
 	ALIGN1
-	.type	SYM(_ZTIPKDd), @object
+	.type	SYM(_ZTIPKDd), %object
 	.size	SYM(_ZTIPKDd), SIZE1
 _ZTIPKDd:
 	POINTER	SYM(_ZTVN10__cxxabiv119__pointer_type_infoE)+OFF
@@ -114,7 +116,7 @@
 	.weak	SYM(_ZTIPDd)
 	SECTION1(_ZTIPDd)
 	ALIGN1
-	.type	SYM(_ZTIPDd), @object
+	.type	SYM(_ZTIPDd), %object
 	.size	SYM(_ZTIPDd), SIZE1
 _ZTIPDd:
 	POINTER	SYM(_ZTVN10__cxxabiv119__pointer_type_infoE)+OFF
@@ -125,7 +127,7 @@
 	.weak	SYM(_ZTIDd)
 	SECTION2(_ZTIDd)
 	ALIGN2
-	.type	SYM(_ZTIDd), @object
+	.type	SYM(_ZTIDd), %object
 	.size	SYM(_ZTIDd), SIZE2
 _ZTIDd:
 	POINTER	SYM(_ZTVN10__cxxabiv123__fundamental_type_infoE)+OFF
@@ -133,7 +135,7 @@
 	.weak	SYM(_ZTIPKDe)
 	SECTION1(_ZTIPKDe)
 	ALIGN1
-	.type	SYM(_ZTIPKDe), @object
+	.type	SYM(_ZTIPKDe), %object
 	.size	SYM(_ZTIPKDe), SIZE1
 _ZTIPKDe:
 	POINTER	SYM(_ZTVN10__cxxabiv119__pointer_type_infoE)+OFF
@@ -144,7 +146,7 @@
 	.weak	SYM(_ZTIPDe)
 	SECTION1(_ZTIPDe)
 	ALIGN1
-	.type	SYM(_ZTIPDe), @object
+	.type	SYM(_ZTIPDe), %object
 	.size	SYM(_ZTIPDe), SIZE1
 _ZTIPDe:
 	POINTER	SYM(_ZTVN10__cxxabiv119__pointer_type_infoE)+OFF
@@ -155,7 +157,7 @@
 	.weak	SYM(_ZTIDe)
 	SECTION2(_ZTIDe)
 	ALIGN2
-	.type	SYM(_ZTIDe), @object
+	.type	SYM(_ZTIDe), %object
 	.size	SYM(_ZTIDe), SIZE2
 _ZTIDe:
 	POINTER	SYM(_ZTVN10__cxxabiv123__fundamental_type_infoE)+OFF
@@ -163,7 +165,7 @@
 	.weak	SYM(_ZTIPKDf)
 	SECTION1(_ZTIPKDf)
 	ALIGN1
-	.type	SYM(_ZTIPKDf), @object
+	.type	SYM(_ZTIPKDf), %object
 	.size	SYM(_ZTIPKDf), SIZE1
 _ZTIPKDf:
 	POINTER	SYM(_ZTVN10__cxxabiv119__pointer_type_infoE)+OFF
@@ -174,7 +176,7 @@
 	.weak	SYM(_ZTIPDf)
 	SECTION1(_ZTIPDf)
 	ALIGN1
-	.type	SYM(_ZTIPDf), @object
+	.type	SYM(_ZTIPDf), %object
 	.size	SYM(_ZTIPDf), SIZE1
 _ZTIPDf:
 	POINTER	SYM(_ZTVN10__cxxabiv119__pointer_type_infoE)+OFF
@@ -185,7 +187,7 @@
 	.weak	SYM(_ZTIDf)
 	SECTION2(_ZTIDf)
 	ALIGN2
-	.type	SYM(_ZTIDf), @object
+	.type	SYM(_ZTIDf), %object
 	.size	SYM(_ZTIDf), SIZE2
 _ZTIDf:
 	POINTER	SYM(_ZTVN10__cxxabiv123__fundamental_type_infoE)+OFF
@@ -194,7 +196,7 @@
 	.hidden	SYM(_ZTSPKDd)
 	SECTION3(_ZTSPKDd)
 	ALIGN3
-	.type	SYM(_ZTSPKDd), @object
+	.type	SYM(_ZTSPKDd), %object
 	.size	SYM(_ZTSPKDd), 5
 _ZTSPKDd:
 	STRING	"PKDd"
@@ -202,7 +204,7 @@
 	.hidden	SYM(_ZTSPDd)
 	SECTION3(_ZTSPDd)
 	ALIGN3
-	.type	SYM(_ZTSPDd), @object
+	.type	SYM(_ZTSPDd), %object
 	.size	SYM(_ZTSPDd), 4
 _ZTSPDd:
 	STRING	"PDd"
@@ -210,7 +212,7 @@
 	.hidden	SYM(_ZTSDd)
 	SECTION3(_ZTSDd)
 	ALIGN3
-	.type	SYM(_ZTSDd), @object
+	.type	SYM(_ZTSDd), %object
 	.size	SYM(_ZTSDd), 3
 _ZTSDd:
 	STRING	"Dd"
@@ -218,7 +220,7 @@
 	.hidden	SYM(_ZTSPKDe)
 	SECTION3(_ZTSPKDe)
 	ALIGN3
-	.type	SYM(_ZTSPKDe), @object
+	.type	SYM(_ZTSPKDe), %object
 	.size	SYM(_ZTSPKDe), 5
 _ZTSPKDe:
 	STRING	"PKDe"
@@ -226,7 +228,7 @@
 	.hidden	SYM(_ZTSPDe)
 	SECTION3(_ZTSPDe)
 	ALIGN3
-	.type	SYM(_ZTSPDe), @object
+	.type	SYM(_ZTSPDe), %object
 	.size	SYM(_ZTSPDe), 4
 _ZTSPDe:
 	STRING	"PDe"
@@ -234,7 +236,7 @@
 	.hidden	SYM(_ZTSDe)
 	SECTION3(_ZTSDe)
 	ALIGN3
-	.type	SYM(_ZTSDe), @object
+	.type	SYM(_ZTSDe), %object
 	.size	SYM(_ZTSDe), 3
 _ZTSDe:
 	STRING	"De"
@@ -242,7 +244,7 @@
 	.hidden	SYM(_ZTSPKDf)
 	SECTION3(_ZTSPKDf)
 	ALIGN3
-	.type	SYM(_ZTSPKDf), @object
+	.type	SYM(_ZTSPKDf), %object
 	.size	SYM(_ZTSPKDf), 5
 _ZTSPKDf:
 	STRING	"PKDf"
@@ -250,7 +252,7 @@
 	.hidden	SYM(_ZTSPDf)
 	SECTION3(_ZTSPDf)
 	ALIGN3
-	.type	SYM(_ZTSPDf), @object
+	.type	SYM(_ZTSPDf), %object
 	.size	SYM(_ZTSPDf), 4
 _ZTSPDf:
 	STRING	"PDf"
@@ -258,9 +260,10 @@
 	.hidden	SYM(_ZTSDf)
 	SECTION3(_ZTSDf)
 	ALIGN3
-	.type	SYM(_ZTSDf), @object
+	.type	SYM(_ZTSDf), %object
 	.size	SYM(_ZTSDf), 3
 _ZTSDf:
 	STRING	"Df"
 #endif
-	.section	.note.GNU-stack,"",@progbits
+
+	.section	.note.GNU-stack,"",%progbits
--- libstdc++-v3/src/nonshared98/nullptr-rtti.S.orig	2015-08-13 17:20:15.258621574 +0100
+++ libstdc++-v3/src/nonshared98/nullptr-rtti.S	2015-08-13 17:22:11.728533593 +0100
@@ -21,9 +21,11 @@
    <http://www.gnu.org/licenses/>.  */
 
 #if defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __ia64__ \
-    || defined __i386__ || defined __powerpc__ || defined __s390__
+    || defined __i386__ || defined __powerpc__ || defined __s390__ || defined __arm__
 #ifdef __i386__
 #define ALIGN1	.align 4
+#elif defined __arm__
+#define ALIGN1	.align 4
 #elif defined __x86_64__
 #define ALIGN1	.align 32
 #define ALIGN2	.align 16
@@ -31,7 +33,7 @@
 #define SYM(x)x#
 #define ALIGN1	.align 8
 #define ALIGN3	.align 8
-#define SECTION3(x).section .gnu.linkonce.s.x,"aws",@progbits
+#define SECTION3(x).section .gnu.linkonce.s.x,"aws",%progbits
 #define POINTER	data8
 #define FLAGS data4
 #define PAD .skip 4
@@ -42,7 +44,7 @@
 #elif defined __powerpc__
 #define ALIGN1	.align 2
 #define ALIGN3	.align 2
-#define SECTION2(x).section .gnu.linkonce.s.x,"aw",@progbits
+#define SECTION2(x).section .gnu.linkonce.s.x,"aw",%progbits
 #define SECTION3(x)SECTION2(x)
 #elif defined __s390x__
 #define ALIGN1	.align 8
@@ -88,13 +90,13 @@
 #define ALIGN3
 #endif
 #ifndef SECTION1
-#define SECTION1(x).section .gnu.linkonce.d.rel.ro.x,"aw",@progbits
+#define SECTION1(x).section .gnu.linkonce.d.rel.ro.x,"aw",%progbits
 #endif
 #ifndef SECTION2
 #define SECTION2(x)SECTION1(x)
 #endif
 #ifndef SECTION3
-#define SECTION3(x).section .gnu.linkonce.r.x,"a",@progbits
+#define SECTION3(x).section .gnu.linkonce.r.x,"a",%progbits
 #endif
 #ifndef STRING
 #define STRING .string
@@ -103,7 +105,7 @@
 	.weak	SYM(_ZTIPKDn)
 	SECTION1(_ZTIPKDn)
 	ALIGN1
-	.type	SYM(_ZTIPKDn), @object
+	.type	SYM(_ZTIPKDn), %object
 	.size	SYM(_ZTIPKDn), SIZE1
 _ZTIPKDn:
 	POINTER	SYM(_ZTVN10__cxxabiv119__pointer_type_infoE)+OFF
@@ -114,7 +116,7 @@
 	.weak	SYM(_ZTIPDn)
 	SECTION1(_ZTIPDn)
 	ALIGN1
-	.type	SYM(_ZTIPDn), @object
+	.type	SYM(_ZTIPDn), %object
 	.size	SYM(_ZTIPDn), SIZE1
 _ZTIPDn:
 	POINTER	SYM(_ZTVN10__cxxabiv119__pointer_type_infoE)+OFF
@@ -125,7 +127,7 @@
 	.weak	SYM(_ZTIDn)
 	SECTION2(_ZTIDn)
 	ALIGN2
-	.type	SYM(_ZTIDn), @object
+	.type	SYM(_ZTIDn), %object
 	.size	SYM(_ZTIDn), SIZE2
 _ZTIDn:
 	POINTER	SYM(_ZTVN10__cxxabiv123__fundamental_type_infoE)+OFF
@@ -134,7 +136,7 @@
 	.hidden	SYM(_ZTSPKDn)
 	SECTION3(_ZTSPKDn)
 	ALIGN3
-	.type	SYM(_ZTSPKDn), @object
+	.type	SYM(_ZTSPKDn), %object
 	.size	SYM(_ZTSPKDn), 5
 _ZTSPKDn:
 	STRING	"PKDn"
@@ -142,7 +144,7 @@
 	.hidden	SYM(_ZTSPDn)
 	SECTION3(_ZTSPDn)
 	ALIGN3
-	.type	SYM(_ZTSPDn), @object
+	.type	SYM(_ZTSPDn), %object
 	.size	SYM(_ZTSPDn), 4
 _ZTSPDn:
 	STRING	"PDn"
@@ -150,9 +152,9 @@
 	.hidden	SYM(_ZTSDn)
 	SECTION3(_ZTSDn)
 	ALIGN3
-	.type	SYM(_ZTSDn), @object
+	.type	SYM(_ZTSDn), %object
 	.size	SYM(_ZTSDn), 3
 _ZTSDn:
 	STRING	"Dn"
 #endif
-	.section	.note.GNU-stack,"",@progbits
+	.section	.note.GNU-stack,"",%progbits
--- libstdc++-v3/src/nonshared98/int128.S.orig	2015-08-13 22:20:13.900187079 +0100
+++ libstdc++-v3/src/nonshared98/int128.S	2015-08-13 22:21:20.400161999 +0100
@@ -209,4 +209,4 @@
 _ZTSo:
 	STRING	"o"
 #endif
-	.section	.note.GNU-stack,"",@progbits
+	.section	.note.GNU-stack,"",%progbits
--- libstdc++-v3/src/nonshared98/char1632-rtti.S.orig	2015-08-14 14:38:31.508827571 +0100
+++ libstdc++-v3/src/nonshared98/char1632-rtti.S	2015-08-14 14:39:44.008762029 +0100
@@ -21,9 +21,11 @@
    <http://www.gnu.org/licenses/>.  */
 
 #if defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __ia64__ \
-    || defined __i386__ || defined __powerpc__ || defined __s390__
+    || defined __i386__ || defined __powerpc__ || defined __s390__ || defined __arm__
 #ifdef __i386__
 #define ALIGN1	.align 4
+#elif defined __arm__
+#define ALIGN1	.align 4
 #elif defined __x86_64__
 #define ALIGN1	.align 32
 #define ALIGN2	.align 16
@@ -31,7 +33,7 @@
 #define SYM(x)x#
 #define ALIGN1	.align 8
 #define ALIGN3	.align 8
-#define SECTION3(x).section .gnu.linkonce.s.x,"aws",@progbits
+#define SECTION3(x).section .gnu.linkonce.s.x,"aws",%progbits
 #define POINTER	data8
 #define FLAGS data4
 #define PAD .skip 4
@@ -42,7 +44,7 @@
 #elif defined __powerpc__
 #define ALIGN1	.align 2
 #define ALIGN3	.align 2
-#define SECTION2(x).section .gnu.linkonce.s.x,"aw",@progbits
+#define SECTION2(x).section .gnu.linkonce.s.x,"aw",%progbits
 #define SECTION3(x)SECTION2(x)
 #elif defined __s390x__
 #define ALIGN1	.align 8
@@ -88,13 +90,13 @@
 #define ALIGN3
 #endif
 #ifndef SECTION1
-#define SECTION1(x).section .gnu.linkonce.d.rel.ro.x,"aw",@progbits
+#define SECTION1(x).section .gnu.linkonce.d.rel.ro.x,"aw",%progbits
 #endif
 #ifndef SECTION2
 #define SECTION2(x)SECTION1(x)
 #endif
 #ifndef SECTION3
-#define SECTION3(x).section .gnu.linkonce.r.x,"a",@progbits
+#define SECTION3(x).section .gnu.linkonce.r.x,"a",%progbits
 #endif
 #ifndef STRING
 #define STRING .string
@@ -103,7 +105,7 @@
 	.weak	SYM(_ZTIPKDi)
 	SECTION1(_ZTIPKDi)
 	ALIGN1
-	.type	SYM(_ZTIPKDi), @object
+	.type	SYM(_ZTIPKDi), %object
 	.size	SYM(_ZTIPKDi), SIZE1
 _ZTIPKDi:
 	POINTER	SYM(_ZTVN10__cxxabiv119__pointer_type_infoE)+OFF
@@ -114,7 +116,7 @@
 	.weak	SYM(_ZTIPDi)
 	SECTION1(_ZTIPDi)
 	ALIGN1
-	.type	SYM(_ZTIPDi), @object
+	.type	SYM(_ZTIPDi), %object
 	.size	SYM(_ZTIPDi), SIZE1
 _ZTIPDi:
 	POINTER	SYM(_ZTVN10__cxxabiv119__pointer_type_infoE)+OFF
@@ -125,7 +127,7 @@
 	.weak	SYM(_ZTIDi)
 	SECTION2(_ZTIDi)
 	ALIGN2
-	.type	SYM(_ZTIDi), @object
+	.type	SYM(_ZTIDi), %object
 	.size	SYM(_ZTIDi), SIZE2
 _ZTIDi:
 	POINTER	SYM(_ZTVN10__cxxabiv123__fundamental_type_infoE)+OFF
@@ -133,7 +135,7 @@
 	.weak	SYM(_ZTIPKDs)
 	SECTION1(_ZTIPKDs)
 	ALIGN1
-	.type	SYM(_ZTIPKDs), @object
+	.type	SYM(_ZTIPKDs), %object
 	.size	SYM(_ZTIPKDs), SIZE1
 _ZTIPKDs:
 	POINTER	SYM(_ZTVN10__cxxabiv119__pointer_type_infoE)+OFF
@@ -144,7 +146,7 @@
 	.weak	SYM(_ZTIPDs)
 	SECTION1(_ZTIPDs)
 	ALIGN1
-	.type	SYM(_ZTIPDs), @object
+	.type	SYM(_ZTIPDs), %object
 	.size	SYM(_ZTIPDs), SIZE1
 _ZTIPDs:
 	POINTER	SYM(_ZTVN10__cxxabiv119__pointer_type_infoE)+OFF
@@ -155,7 +157,7 @@
 	.weak	SYM(_ZTIDs)
 	SECTION2(_ZTIDs)
 	ALIGN2
-	.type	SYM(_ZTIDs), @object
+	.type	SYM(_ZTIDs), %object
 	.size	SYM(_ZTIDs), SIZE2
 _ZTIDs:
 	POINTER	SYM(_ZTVN10__cxxabiv123__fundamental_type_infoE)+OFF
@@ -164,7 +166,7 @@
 	.hidden	SYM(_ZTSPKDi)
 	SECTION3(_ZTSPKDi)
 	ALIGN3
-	.type	SYM(_ZTSPKDi), @object
+	.type	SYM(_ZTSPKDi), %object
 	.size	SYM(_ZTSPKDi), 5
 _ZTSPKDi:
 	STRING	"PKDi"
@@ -172,7 +174,7 @@
 	.hidden	SYM(_ZTSPDi)
 	SECTION3(_ZTSPDi)
 	ALIGN3
-	.type	SYM(_ZTSPDi), @object
+	.type	SYM(_ZTSPDi), %object
 	.size	SYM(_ZTSPDi), 4
 _ZTSPDi:
 	STRING	"PDi"
@@ -180,7 +182,7 @@
 	.hidden	SYM(_ZTSDi)
 	SECTION3(_ZTSDi)
 	ALIGN3
-	.type	SYM(_ZTSDi), @object
+	.type	SYM(_ZTSDi), %object
 	.size	SYM(_ZTSDi), 3
 _ZTSDi:
 	STRING	"Di"
@@ -188,7 +190,7 @@
 	.hidden	SYM(_ZTSPKDs)
 	SECTION3(_ZTSPKDs)
 	ALIGN3
-	.type	SYM(_ZTSPKDs), @object
+	.type	SYM(_ZTSPKDs), %object
 	.size	SYM(_ZTSPKDs), 5
 _ZTSPKDs:
 	STRING	"PKDs"
@@ -196,7 +198,7 @@
 	.hidden	SYM(_ZTSPDs)
 	SECTION3(_ZTSPDs)
 	ALIGN3
-	.type	SYM(_ZTSPDs), @object
+	.type	SYM(_ZTSPDs), %object
 	.size	SYM(_ZTSPDs), 4
 _ZTSPDs:
 	STRING	"PDs"
@@ -204,9 +206,9 @@
 	.hidden	SYM(_ZTSDs)
 	SECTION3(_ZTSDs)
 	ALIGN3
-	.type	SYM(_ZTSDs), @object
+	.type	SYM(_ZTSDs), %object
 	.size	SYM(_ZTSDs), 3
 _ZTSDs:
 	STRING	"Ds"
 #endif
-	.section	.note.GNU-stack,"",@progbits
+	.section	.note.GNU-stack,"",%progbits