diff options
| -rw-r--r-- | gcc-4.9/gcc/cp/call.c | 3 | ||||
| -rw-r--r-- | gcc-4.9/gcc/cp/init.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gcc-4.9/gcc/cp/call.c b/gcc-4.9/gcc/cp/call.c index 877f6d9cf..9a0e3b5a1 100644 --- a/gcc-4.9/gcc/cp/call.c +++ b/gcc-4.9/gcc/cp/call.c @@ -4008,7 +4008,8 @@ build_operator_new_call (tree fnname, vec<tree, va_gc> **args, if (size_check != NULL_TREE) { tree errval = TYPE_MAX_VALUE (sizetype); - if (cxx_dialect >= cxx11 && flag_exceptions) + /* ANDROID - temporarily disable __cxa_throw_bad_array_new_length call. */ + if (cxx_dialect >= cxx11 && flag_exceptions && 0) errval = throw_bad_array_new_length (); *size = fold_build3 (COND_EXPR, sizetype, size_check, original_size, errval); diff --git a/gcc-4.9/gcc/cp/init.c b/gcc-4.9/gcc/cp/init.c index 2e1cddef4..a2549575a 100644 --- a/gcc-4.9/gcc/cp/init.c +++ b/gcc-4.9/gcc/cp/init.c @@ -2552,7 +2552,9 @@ build_new_1 (vec<tree, va_gc> **placement, tree type, tree nelts, } /* Perform the overflow check. */ tree errval = TYPE_MAX_VALUE (sizetype); - if (cxx_dialect >= cxx11 && flag_exceptions) + /* ANDROID - temporarily disable __cxa_throw_bad_array_new_length + call. */ + if (cxx_dialect >= cxx11 && flag_exceptions && 0) errval = throw_bad_array_new_length (); if (outer_nelts_check != NULL_TREE) size = fold_build3 (COND_EXPR, sizetype, outer_nelts_check, |