1From 4fe805f627c018d77091ea0aad92553c54d47567 Mon Sep 17 00:00:00 2001 2From: David 'Digit' Turner <digit@google.com> 3Date: Fri, 17 Feb 2012 19:35:45 +0100 4Subject: Enable C++ exceptions and RTTI by default. 5 6With this change, -fexceptions and -frtti become default options 7when compiling C++ sources. 8--- 9 gcc-4.4.3/gcc/config/linux-android.h | 4 ++-- 10 gcc-4.6/gcc/config/linux-android.h | 4 ++-- 11 2 files changed, 4 insertions(+), 4 deletions(-) 12 13diff --git a/gcc-4.4.3/gcc/config/linux-android.h b/gcc-4.4.3/gcc/config/linux-android.h 14index 5ca3858..d938c22 100644 15--- a/gcc-4.4.3/gcc/config/linux-android.h 16+++ b/gcc-4.4.3/gcc/config/linux-android.h 17@@ -46,8 +46,8 @@ 18 "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}" 19 20 #define ANDROID_CC1PLUS_SPEC \ 21- "%{!fexceptions:%{!fno-exceptions: -fno-exceptions}} " \ 22- "%{!frtti:%{!fno-rtti: -fno-rtti}}" 23+ "%{!fexceptions:%{!fno-exceptions: -fexceptions}} " \ 24+ "%{!frtti:%{!fno-rtti: -frtti}}" 25 26 #define ANDROID_ASM_SPEC \ 27 "--noexecstack" 28diff --git a/gcc-4.6/gcc/config/linux-android.h b/gcc-4.6/gcc/config/linux-android.h 29index 94c5274..7256082 100644 30--- a/gcc-4.6/gcc/config/linux-android.h 31+++ b/gcc-4.6/gcc/config/linux-android.h 32@@ -46,8 +46,8 @@ 33 "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}" 34 35 #define ANDROID_CC1PLUS_SPEC \ 36- "%{!fexceptions:%{!fno-exceptions: -fno-exceptions}} " \ 37- "%{!frtti:%{!fno-rtti: -fno-rtti}}" 38+ "%{!fexceptions:%{!fno-exceptions: -fexceptions}} " \ 39+ "%{!frtti:%{!fno-rtti: -frtti}}" 40 41 #define ANDROID_ASM_SPEC \ 42 "--noexecstack" 43diff --git a/gcc-4.7/gcc/config/linux-android.h b/gcc-4.7/gcc/config/linux-android.h 44index 94c5274..7256082 100644 45--- a/gcc-4.7/gcc/config/linux-android.h 46+++ b/gcc-4.7/gcc/config/linux-android.h 47@@ -46,8 +46,8 @@ 48 "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}" 49 50 #define ANDROID_CC1PLUS_SPEC \ 51- "%{!fexceptions:%{!fno-exceptions: -fno-exceptions}} " \ 52- "%{!frtti:%{!fno-rtti: -fno-rtti}}" 53+ "%{!fexceptions:%{!fno-exceptions: -fexceptions}} " \ 54+ "%{!frtti:%{!fno-rtti: -frtti}}" 55 56 #define ANDROID_ASM_SPEC \ 57 "--noexecstack" 58-- 591.7.6.rc0 60 61