Index: gcc/config/arm/eabi.h =================================================================== --- gcc/config/arm/eabi.h (revision 157396) +++ gcc/config/arm/eabi.h (working copy) @@ -64,8 +64,10 @@ " : %(link_default)}" /* Android uses -fno-exceptions by default. */ +#if 0 #undef ANDROID_CC1_SPEC #define ANDROID_CC1_SPEC "%{!fexceptions:-fno-exceptions}" +#endif /* Default CC1_SPEC as in arm.h. */ #undef CC1_DEFAULT_SPEC @@ -76,9 +78,12 @@ "%{mandroid: %(cc1_android) ;" \ " : %(cc1_default)}" +#if 0 /* Android uses -fno-rtti by default. */ #undef ANDROID_CC1PLUS_SPEC #define ANDROID_CC1PLUS_SPEC "%{!frtti:-fno-rtti}" +#endif +#define ANDROID_CC1PLUS_SPEC "" /* Default CC1PLUS_SPEC as in gcc.c. */ #undef CC1PLUS_DEFAULT_SPEC