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.6/gcc/config/linux-android.h | 4 ++-- 10 2 files changed, 4 insertions(+), 4 deletions(-) 11 12diff --git a/gcc-4.6/gcc/config/linux-android.h b/gcc-4.6/gcc/config/linux-android.h 13index 94c5274..7256082 100644 14--- a/gcc-4.6/gcc/config/linux-android.h 15+++ b/gcc-4.6/gcc/config/linux-android.h 16@@ -46,8 +46,8 @@ 17 "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}" 18 19 #define ANDROID_CC1PLUS_SPEC \ 20- "%{!fexceptions:%{!fno-exceptions: -fno-exceptions}} " \ 21- "%{!frtti:%{!fno-rtti: -fno-rtti}}" 22+ "%{!fexceptions:%{!fno-exceptions: -fexceptions}} " \ 23+ "%{!frtti:%{!fno-rtti: -frtti}}" 24 25 #define ANDROID_ASM_SPEC \ 26 "--noexecstack" 27diff --git a/gcc-4.7/gcc/config/linux-android.h b/gcc-4.7/gcc/config/linux-android.h 28index 94c5274..7256082 100644 29--- a/gcc-4.7/gcc/config/linux-android.h 30+++ b/gcc-4.7/gcc/config/linux-android.h 31@@ -46,8 +46,8 @@ 32 "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}" 33 34 #define ANDROID_CC1PLUS_SPEC \ 35- "%{!fexceptions:%{!fno-exceptions: -fno-exceptions}} " \ 36- "%{!frtti:%{!fno-rtti: -fno-rtti}}" 37+ "%{!fexceptions:%{!fno-exceptions: -fexceptions}} " \ 38+ "%{!frtti:%{!fno-rtti: -frtti}}" 39 40 #define ANDROID_ASM_SPEC \ 41 "--noexecstack" 42diff --git a/gcc-4.8/gcc/config/linux-android.h b/gcc-4.8/gcc/config/linux-android.h 43index 2c87c84..47a3e7c 100644 44--- a/gcc-4.8/gcc/config/linux-android.h 45+++ b/gcc-4.8/gcc/config/linux-android.h 46@@ -45,8 +45,8 @@ 47 "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}" 48 49 #define ANDROID_CC1PLUS_SPEC \ 50- "%{!fexceptions:%{!fno-exceptions: -fno-exceptions}} " \ 51- "%{!frtti:%{!fno-rtti: -fno-rtti}}" 52+ "%{!fexceptions:%{!fno-exceptions: -fexceptions}} " \ 53+ "%{!frtti:%{!fno-rtti: -frtti}}" 54 55 #define ANDROID_ASM_SPEC \ 56 "--noexecstack" 57-- 581.7.6.rc0 59