| diff -Naurp a/libstdc++-v3/src/nonshared11/cow-shim_facets.cc b/libstdc++-v3/src/nonshared11/cow-shim_facets.cc |
| |
| |
| @@ -168,7 +168,7 @@ asm (".hidden _ZTVNSt13__facet_shims12_G |
| asm (".hidden _ZTVNSt13__facet_shims12_GLOBAL__N_115moneypunct_shimIwLb1EEE"); |
| asm (".hidden _ZNSt13__facet_shims21__numpunct_fill_cacheIcEEvSt17integral_constantIbLb0EEPKNSt6locale5facetEPSt16__numpunct_cacheIT_E"); |
| asm (".hidden _ZNSt13__facet_shims21__numpunct_fill_cacheIwEEvSt17integral_constantIbLb0EEPKNSt6locale5facetEPSt16__numpunct_cacheIT_E"); |
| -#if defined(__i386__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| +#if defined(__i386__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| asm (".hidden _ZNSt13__facet_shims14__messages_getIcEEvSt17integral_constantIbLb0EEPKNSt6locale5facetERNS_12__any_stringEiiiPKT_j"); |
| asm (".hidden _ZNSt13__facet_shims14__messages_getIwEEvSt17integral_constantIbLb0EEPKNSt6locale5facetERNS_12__any_stringEiiiPKT_j"); |
| asm (".hidden _ZNSt13__facet_shims15__messages_openIcEEiSt17integral_constantIbLb0EEPKNSt6locale5facetEPKcjRKS3_"); |
| diff -Naurp a/libstdc++-v3/src/nonshared11/cow-stdexcept.cc b/libstdc++-v3/src/nonshared11/cow-stdexcept.cc |
| |
| |
| @@ -35,7 +35,7 @@ asm (".hidden _ZNSt12__cow_stringaSEOS_" |
| asm (".hidden _ZNSt12__cow_stringaSERKS_"); |
| asm (".hidden _ZNSt12__sso_stringC1ERKSs"); |
| asm (".hidden _ZNSt12__sso_stringC2ERKSs"); |
| -#if defined(__i386__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| +#if defined(__i386__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| asm (".hidden _ZNSt12__cow_stringC1EPKcj"); |
| asm (".hidden _ZNSt12__cow_stringC2EPKcj"); |
| #else |
| diff -Naurp a/libstdc++-v3/src/nonshared11/cxx11-shim_facets.cc b/libstdc++-v3/src/nonshared11/cxx11-shim_facets.cc |
| |
| |
| @@ -168,7 +168,7 @@ asm (".hidden _ZTVNSt13__facet_shims12_G |
| asm (".hidden _ZTVNSt13__facet_shims12_GLOBAL__N_115moneypunct_shimIcLb1EEE"); |
| asm (".hidden _ZTVNSt13__facet_shims12_GLOBAL__N_115moneypunct_shimIwLb0EEE"); |
| asm (".hidden _ZTVNSt13__facet_shims12_GLOBAL__N_115moneypunct_shimIwLb1EEE"); |
| -#if defined(__i386__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| +#if defined(__i386__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| asm (".hidden _ZNSt13__facet_shims14__messages_getIcEEvSt17integral_constantIbLb1EEPKNSt6locale5facetERNS_12__any_stringEiiiPKT_j"); |
| asm (".hidden _ZNSt13__facet_shims14__messages_getIwEEvSt17integral_constantIbLb1EEPKNSt6locale5facetERNS_12__any_stringEiiiPKT_j"); |
| asm (".hidden _ZNSt13__facet_shims15__messages_openIcEEiSt17integral_constantIbLb1EEPKNSt6locale5facetEPKcjRKS3_"); |
| diff -Naurp a/libstdc++-v3/src/nonshared11/cxx11-wlocale-inst.cc b/libstdc++-v3/src/nonshared11/cxx11-wlocale-inst.cc |
| |
| |
| @@ -36,7 +36,7 @@ asm (".hidden _ZNKSt17__gnu_cxx_ldbl1287 |
| asm (".hidden _ZNKSt17__gnu_cxx_ldbl1287num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intB5cxx11IxEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_"); |
| asm (".hidden _ZNKSt17__gnu_cxx_ldbl1287num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intB5cxx11IyEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_"); |
| #endif |
| -#if defined(__i386__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| +#if defined(__i386__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| asm (".hidden _ZNSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC1ERKNSt7__cxx1112basic_stringIcS1_IcESaIcEEEj"); |
| asm (".hidden _ZNSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2ERKNSt7__cxx1112basic_stringIcS1_IcESaIcEEEj"); |
| #else |
| diff -Naurp a/libstdc++-v3/src/nonshared11/locale-inst-asm.S b/libstdc++-v3/src/nonshared11/locale-inst-asm.S |
| |
| |
| @@ -43,6 +43,11 @@ |
| #define ALIGN3 .align 2 |
| #define SECTION2(x).section .gnu.linkonce.s.x,"aw",@progbits |
| #define SECTION3(x)SECTION2(x) |
| +#elif defined __arm__ |
| +#define ALIGN1 .align 4 |
| +#define OBJECT %object |
| +#define SECTION1(x).section .gnu.linkonce.d.rel.ro.x,"aw",%progbits |
| +#define SECTION3(x).section .gnu.linkonce.r.x,"a",%progbits |
| #elif defined __aarch64__ |
| #define ALIGN1 .align 3 |
| #define ALIGN3 .align 3 |
| @@ -288,4 +293,4 @@ _ZTVSt16__numpunct_cacheIwE: |
| POINTER SYM(_ZTISt16__numpunct_cacheIwE) |
| VPTR(_ZNSt16__numpunct_cacheIwED1Ev) |
| VPTR(_ZNSt16__numpunct_cacheIwED0Ev) |
| - .section .note.GNU-stack,"",@progbits |
| + .section .note.GNU-stack,"",%progbits |
| diff -Naurp a/libstdc++-v3/src/nonshared11/locale-inst.cc b/libstdc++-v3/src/nonshared11/locale-inst.cc |
| |
| |
| @@ -75,13 +75,13 @@ _GLIBCXX_END_NAMESPACE_VERSION |
| |
| #ifndef _GLIBCXX_NONSHARED_CXX11_80 |
| #ifdef C_is_char |
| -#if defined(__i386__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| +#if defined(__i386__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| asm (".hidden _ZSt14__add_groupingIcEPT_S1_S0_PKcjPKS0_S5_"); |
| #else |
| asm (".hidden _ZSt14__add_groupingIcEPT_S1_S0_PKcmPKS0_S5_"); |
| #endif |
| #else |
| -#if defined(__i386__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| +#if defined(__i386__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| asm (".hidden _ZSt14__add_groupingIwEPT_S1_S0_PKcjPKS0_S5_"); |
| #else |
| asm (".hidden _ZSt14__add_groupingIwEPT_S1_S0_PKcmPKS0_S5_"); |
| diff -Naurp a/libstdc++-v3/src/nonshared11/snprintf_lite.cc b/libstdc++-v3/src/nonshared11/snprintf_lite.cc |
| |
| |
| @@ -30,6 +30,9 @@ asm (".hidden _ZN9__gnu_cxx15__snprintf_ |
| #elif defined(__powerpc__) |
| asm (".hidden _ZN9__gnu_cxx15__concat_size_tEPcjj"); |
| asm (".hidden _ZN9__gnu_cxx15__snprintf_liteEPcjPKcP13__va_list_tag"); |
| +#elif defined(__arm__) |
| +asm (".hidden _ZN9__gnu_cxx15__concat_size_tEPcjj"); |
| +asm (".hidden _ZN9__gnu_cxx15__snprintf_liteEPcjPKcSt9__va_list"); |
| #elif defined(__aarch64__) |
| asm (".hidden _ZN9__gnu_cxx15__concat_size_tEPcmm"); |
| asm (".hidden _ZN9__gnu_cxx15__snprintf_liteEPcmPKcSt9__va_list"); |
| diff -Naurp a/libstdc++-v3/src/nonshared11/sso_string.cc b/libstdc++-v3/src/nonshared11/sso_string.cc |
| |
| |
| @@ -39,7 +39,7 @@ asm (".hidden _ZNSt12__sso_stringD1Ev"); |
| asm (".hidden _ZNSt12__sso_stringD2Ev"); |
| asm (".hidden _ZNSt12__sso_stringaSEOS_"); |
| asm (".hidden _ZNSt12__sso_stringaSERKS_"); |
| -#if defined(__i386__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| +#if defined(__i386__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| asm (".hidden _ZNSt12__sso_stringC1EPKcj"); |
| asm (".hidden _ZNSt12__sso_stringC2EPKcj"); |
| #else |
| diff -Naurp a/libstdc++-v3/src/nonshared98/char8_t-rtti.S b/libstdc++-v3/src/nonshared98/char8_t-rtti.S |
| |
| |
| @@ -21,12 +21,17 @@ |
| <http://www.gnu.org/licenses/>. */ |
| |
| #if defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __ia64__ || defined __aarch64__ \ |
| - || defined __i386__ || defined __powerpc__ || defined __s390__ |
| + || defined __i386__ || defined __powerpc__ || defined __s390__ || defined __arm__ |
| #ifdef __i386__ |
| #define ALIGN1 .align 4 |
| #elif defined __x86_64__ |
| #define ALIGN1 .align 32 |
| #define ALIGN2 .align 16 |
| +#elif defined __arm__ |
| +#define ALIGN1 .align 4 |
| +#define OBJECT %object |
| +#define SECTION1(x).section .gnu.linkonce.d.rel.ro.x,"aw",%progbits |
| +#define SECTION3(x).section .gnu.linkonce.r.x,"a",%progbits |
| #elif defined __ia64__ |
| #define ALIGN1 .align 8 |
| #define ALIGN3 .align 8 |
| @@ -163,4 +168,4 @@ _ZTSPDu: |
| _ZTSDu: |
| STRING "Du" |
| #endif |
| - .section .note.GNU-stack,"",@progbits |
| + .section .note.GNU-stack,"",%progbits |
| diff -Naurp a/libstdc++-v3/src/nonshared98/decimal-rtti.S b/libstdc++-v3/src/nonshared98/decimal-rtti.S |
| |
| |
| @@ -21,7 +21,7 @@ |
| <http://www.gnu.org/licenses/>. */ |
| |
| #if defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __ia64__ || defined __aarch64__ \ |
| - || defined __i386__ || defined __powerpc__ || defined __s390__ |
| + || defined __i386__ || defined __powerpc__ || defined __s390__ || defined __arm__ |
| #ifdef __i386__ |
| #define ALIGN1 .align 4 |
| #elif defined __x86_64__ |
| @@ -43,6 +43,11 @@ |
| #define ALIGN3 .align 2 |
| #define SECTION2(x).section .gnu.linkonce.s.x,"aw",@progbits |
| #define SECTION3(x)SECTION2(x) |
| +#elif defined __arm__ |
| +#define ALIGN1 .align 4 |
| +#define OBJECT %object |
| +#define SECTION1(x).section .gnu.linkonce.d.rel.ro.x,"aw",%progbits |
| +#define SECTION3(x).section .gnu.linkonce.r.x,"a",%progbits |
| #elif defined __aarch64__ |
| #define ALIGN1 .align 3 |
| #define ALIGN3 .align 3 |
| @@ -271,4 +276,4 @@ _ZTSPDf: |
| _ZTSDf: |
| STRING "Df" |
| #endif |
| - .section .note.GNU-stack,"",@progbits |
| + .section .note.GNU-stack,"",%progbits |
| diff -Naurp a/libstdc++-v3/src/nonshared98/float128.S b/libstdc++-v3/src/nonshared98/float128.S |
| |
| |
| @@ -20,12 +20,17 @@ |
| see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
| <http://www.gnu.org/licenses/>. */ |
| |
| -#if defined __x86_64__ || defined __i386__ || defined __ia64__ |
| +#if defined __x86_64__ || defined __i386__ || defined __ia64__ || defined __arm__ |
| #ifdef __i386__ |
| #define ALIGN1 .align 4 |
| #elif defined __x86_64__ |
| #define ALIGN1 .align 32 |
| #define ALIGN2 .align 16 |
| +#elif defined __arm__ |
| +#define ALIGN1 .align 4 |
| +#define OBJECT %object |
| +#define SECTION1(x).section .gnu.linkonce.d.rel.ro.x,"aw",%progbits |
| +#define SECTION3(x).section .gnu.linkonce.r.x,"a",%progbits |
| #elif defined __ia64__ |
| #define ALIGN1 .align 8 |
| #define ALIGN3 .align 8 |
| @@ -159,4 +164,4 @@ _ZTSPg: |
| _ZTSg: |
| STRING "g" |
| #endif |
| - .section .note.GNU-stack,"",@progbits |
| + .section .note.GNU-stack,"",%progbits |
| diff -Naurp a/libstdc++-v3/src/nonshared98/int128.S b/libstdc++-v3/src/nonshared98/int128.S |
| |
| |
| @@ -213,4 +213,4 @@ _ZTSPo: |
| _ZTSo: |
| STRING "o" |
| #endif |
| - .section .note.GNU-stack,"",@progbits |
| + .section .note.GNU-stack,"",%progbits |
| diff -Naurp a/libstdc++-v3/src/nonshared98/locale_facets.cc b/libstdc++-v3/src/nonshared98/locale_facets.cc |
| |
| |
| @@ -22,7 +22,7 @@ |
| |
| #define _GLIBCXX_NONSHARED_CXX11 |
| #include "../c++98/locale_facets.cc" |
| -#if defined(__i386__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| +#if defined(__i386__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) |
| asm (".hidden _ZSt22__verify_grouping_implPKcjS0_j"); |
| #else |
| asm (".hidden _ZSt22__verify_grouping_implPKcmS0_m"); |
| diff -Naurp a/libstdc++-v3/src/nonshared98/nullptr-rtti.S b/libstdc++-v3/src/nonshared98/nullptr-rtti.S |
| |
| |
| @@ -21,7 +21,7 @@ |
| <http://www.gnu.org/licenses/>. */ |
| |
| #if defined __x86_64__ || defined __powerpc64__ || defined __s390x__ || defined __ia64__ || defined __aarch64__ \ |
| - || defined __i386__ || defined __powerpc__ || defined __s390__ |
| + || defined __i386__ || defined __powerpc__ || defined __s390__ || defined __arm__ |
| #ifdef __i386__ |
| #define ALIGN1 .align 4 |
| #elif defined __x86_64__ |
| @@ -43,6 +43,11 @@ |
| #define ALIGN3 .align 2 |
| #define SECTION2(x).section .gnu.linkonce.s.x,"aw",@progbits |
| #define SECTION3(x)SECTION2(x) |
| +#elif defined __arm__ |
| +#define ALIGN1 .align 4 |
| +#define OBJECT %object |
| +#define SECTION1(x).section .gnu.linkonce.d.rel.ro.x,"aw",%progbits |
| +#define SECTION3(x).section .gnu.linkonce.r.x,"a",%progbits |
| #elif defined __aarch64__ |
| #define ALIGN1 .align 3 |
| #define ALIGN3 .align 3 |
| @@ -163,4 +168,4 @@ _ZTSPDn: |
| _ZTSDn: |
| STRING "Dn" |
| #endif |
| - .section .note.GNU-stack,"",@progbits |
| + .section .note.GNU-stack,"",%progbits |