| David 'Digit' Turner | a87c318 | 2012-04-21 00:44:33 +0200 | [diff] [blame] | 1 | From 4fe805f627c018d77091ea0aad92553c54d47567 Mon Sep 17 00:00:00 2001 |
| 2 | From: David 'Digit' Turner <digit@google.com> |
| 3 | Date: Fri, 17 Feb 2012 19:35:45 +0100 |
| David 'Digit' Turner | 2b29b0f | 2012-04-20 16:40:04 +0200 | [diff] [blame] | 4 | Subject: Enable C++ exceptions and RTTI by default. |
| David 'Digit' Turner | 72497ce | 2010-11-24 17:28:16 +0100 | [diff] [blame] | 5 | |
| 6 | With this change, -fexceptions and -frtti become default options |
| 7 | when compiling C++ sources. |
| David 'Digit' Turner | 72497ce | 2010-11-24 17:28:16 +0100 | [diff] [blame] | 8 | --- |
| 9 | gcc-4.4.3/gcc/config/linux-android.h | 4 ++-- |
| David 'Digit' Turner | a87c318 | 2012-04-21 00:44:33 +0200 | [diff] [blame] | 10 | gcc-4.6/gcc/config/linux-android.h | 4 ++-- |
| 11 | 2 files changed, 4 insertions(+), 4 deletions(-) |
| David 'Digit' Turner | 72497ce | 2010-11-24 17:28:16 +0100 | [diff] [blame] | 12 | |
| 13 | diff --git a/gcc-4.4.3/gcc/config/linux-android.h b/gcc-4.4.3/gcc/config/linux-android.h |
| David 'Digit' Turner | 2b29b0f | 2012-04-20 16:40:04 +0200 | [diff] [blame] | 14 | index 5ca3858..d938c22 100644 |
| David 'Digit' Turner | 72497ce | 2010-11-24 17:28:16 +0100 | [diff] [blame] | 15 | --- a/gcc-4.4.3/gcc/config/linux-android.h |
| 16 | +++ b/gcc-4.4.3/gcc/config/linux-android.h |
| David 'Digit' Turner | 2b29b0f | 2012-04-20 16:40:04 +0200 | [diff] [blame] | 17 | @@ -46,8 +46,8 @@ |
| Andrew Hsieh | 9c513cc | 2012-10-23 21:31:08 +0800 | [diff] [blame^] | 18 | "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}" |
| David 'Digit' Turner | 72497ce | 2010-11-24 17:28:16 +0100 | [diff] [blame] | 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 | |
| Andrew Hsieh | 9c513cc | 2012-10-23 21:31:08 +0800 | [diff] [blame^] | 26 | #define ANDROID_ASM_SPEC \ |
| 27 | "--noexecstack" |
| David 'Digit' Turner | a87c318 | 2012-04-21 00:44:33 +0200 | [diff] [blame] | 28 | diff --git a/gcc-4.6/gcc/config/linux-android.h b/gcc-4.6/gcc/config/linux-android.h |
| 29 | index 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 @@ |
| Andrew Hsieh | 9c513cc | 2012-10-23 21:31:08 +0800 | [diff] [blame^] | 33 | "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}" |
| David 'Digit' Turner | a87c318 | 2012-04-21 00:44:33 +0200 | [diff] [blame] | 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 | |
| Andrew Hsieh | 9c513cc | 2012-10-23 21:31:08 +0800 | [diff] [blame^] | 41 | #define ANDROID_ASM_SPEC \ |
| 42 | "--noexecstack" |
| Andrew Hsieh | e6aef48 | 2012-10-02 22:18:25 +0800 | [diff] [blame] | 43 | diff --git a/gcc-4.7/gcc/config/linux-android.h b/gcc-4.7/gcc/config/linux-android.h |
| 44 | index 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 @@ |
| Andrew Hsieh | 9c513cc | 2012-10-23 21:31:08 +0800 | [diff] [blame^] | 48 | "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}" |
| Andrew Hsieh | e6aef48 | 2012-10-02 22:18:25 +0800 | [diff] [blame] | 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 | |
| Andrew Hsieh | 9c513cc | 2012-10-23 21:31:08 +0800 | [diff] [blame^] | 56 | #define ANDROID_ASM_SPEC \ |
| 57 | "--noexecstack" |
| David 'Digit' Turner | 72497ce | 2010-11-24 17:28:16 +0100 | [diff] [blame] | 58 | -- |
| David 'Digit' Turner | 2b29b0f | 2012-04-20 16:40:04 +0200 | [diff] [blame] | 59 | 1.7.6.rc0 |
| David 'Digit' Turner | 72497ce | 2010-11-24 17:28:16 +0100 | [diff] [blame] | 60 | |