diff options
| author | synergydev <synergye@codefi.re> | 2013-10-17 18:16:42 -0700 |
|---|---|---|
| committer | synergydev <synergye@codefi.re> | 2013-10-17 18:16:42 -0700 |
| commit | 61c0330cc243abf13fdd01f377a7f80bd3989eb1 (patch) | |
| tree | 119b08ae76294f23e2b1b7e72ff9a06afa9e8509 /gcc-4.8/libobjc | |
| parent | 1c712bf7621f3859c33fd3afaa61fdcaf3fdfd76 (diff) | |
| download | toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.tar.gz toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.tar.bz2 toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.zip | |
[4.8] Merge GCC 4.8.2
Change-Id: I0f1fcf69c5076d8534c5c45562745e1a37adb197
Diffstat (limited to 'gcc-4.8/libobjc')
| -rw-r--r-- | gcc-4.8/libobjc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc-4.8/libobjc/exception.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/gcc-4.8/libobjc/ChangeLog b/gcc-4.8/libobjc/ChangeLog index a9f4ef6a4..feec5c9b8 100644 --- a/gcc-4.8/libobjc/ChangeLog +++ b/gcc-4.8/libobjc/ChangeLog @@ -1,3 +1,11 @@ +2013-10-16 Release Manager + + * GCC 4.8.2 released. + +2013-07-04 Kai Tietz <ktietz@redhat.com> + + * exception.c: Add check for SjLj to SEH blocks. + 2013-05-31 Release Manager * GCC 4.8.1 released. diff --git a/gcc-4.8/libobjc/exception.c b/gcc-4.8/libobjc/exception.c index 4b05611fe..505086fed 100644 --- a/gcc-4.8/libobjc/exception.c +++ b/gcc-4.8/libobjc/exception.c @@ -202,7 +202,7 @@ get_ttype_entry (struct lsda_header_info *info, _Unwind_Word i) #ifdef SJLJ_EXCEPTIONS #define PERSONALITY_FUNCTION __gnu_objc_personality_sj0 #define __builtin_eh_return_data_regno(x) x -#elif defined(__SEH__) +#elif defined(__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) #define PERSONALITY_FUNCTION __gnu_objc_personality_imp #else #define PERSONALITY_FUNCTION __gnu_objc_personality_v0 @@ -227,7 +227,7 @@ PERSONALITY_FUNCTION (_Unwind_State state, #define CONTINUE_UNWINDING return _URC_CONTINUE_UNWIND -#ifdef __SEH__ +#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) static #endif _Unwind_Reason_Code @@ -524,7 +524,7 @@ objc_exception_throw (id exception) abort (); } -#ifdef __SEH__ +#if defined (__SEH__) && !defined (__USING_SJLJ_EXCEPTIONS__) EXCEPTION_DISPOSITION __gnu_objc_personality_seh0 (PEXCEPTION_RECORD ms_exc, void *this_frame, PCONTEXT ms_orig_context, @@ -533,4 +533,4 @@ __gnu_objc_personality_seh0 (PEXCEPTION_RECORD ms_exc, void *this_frame, return _GCC_specific_handler (ms_exc, this_frame, ms_orig_context, ms_disp, __gnu_objc_personality_imp); } -#endif /* SEH */ +#endif |