diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2006-01-12 00:57:44 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2006-01-12 00:57:44 +0000 |
| commit | ffb875bf7ac128f1a94cb276d234f7419aac885d (patch) | |
| tree | 83f2ac2caa907f0ea1adda25aea746d788615f9f | |
| parent | c4dd20d1bf58a924698d2db0274ba9e868647aed (diff) | |
Radar 4404766.apple/gcc-5251apple-200511-release-branch
Oked by Dale.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/apple-200511-release-branch@109624 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/objc/ChangeLog.apple-ppc | 5 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 14 |
2 files changed, 14 insertions, 5 deletions
diff --git a/gcc/objc/ChangeLog.apple-ppc b/gcc/objc/ChangeLog.apple-ppc index 0be8c94dd00..1415d4836dc 100644 --- a/gcc/objc/ChangeLog.apple-ppc +++ b/gcc/objc/ChangeLog.apple-ppc @@ -1,3 +1,8 @@ +2006-01-10 Fariborz Jahanian <fjahanian@apple.com> + + Radar 4404766 + * objc/objc-act.c (JBLEN): define 64bit version of this macro as well. + 2005-10-07 Fariborz Jahanian <fjahanian@apple.com> radar 4292010 diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index bd63144d320..08c112bda83 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -4294,20 +4294,22 @@ objc_build_synchronized (location_t start_locus, tree mutex, tree body) struct _objc_exception_data { - int buf[_JBLEN]; + int buf[JBLEN]; void *pointers[4]; }; */ /* The following yuckiness should prevent users from having to #include <setjmp.h> in their code... */ +/* APPLE LOCAL begin radar 4404766 */ #ifdef TARGET_POWERPC /* snarfed from /usr/include/ppc/setjmp.h */ -#define _JBLEN (26 + 36 + 129 + 1) +#define JBLEN ((TARGET_64BIT) ? (26*2 + 18*2 + 129 + 1) : (26 + 18*2 + 129 + 1)) #else /* snarfed from /usr/include/i386/{setjmp,signal}.h */ -#define _JBLEN 18 +#define JBLEN 18 #endif +/* APPLE LOCAL end radar 4404766 */ static void build_next_objc_exception_stuff (void) @@ -4317,9 +4319,11 @@ build_next_objc_exception_stuff (void) objc_exception_data_template = start_struct (RECORD_TYPE, get_identifier (UTAG_EXCDATA)); - /* int buf[_JBLEN]; */ + /* APPLE LOCAL begin radar 4404766 */ + /* int buf[JBLEN]; */ - index = build_index_type (build_int_cst (NULL_TREE, _JBLEN - 1)); + index = build_index_type (build_int_cst (NULL_TREE, JBLEN - 1)); + /* APPLE LOCAL end radar 4404766 */ field_decl = create_field_decl (build_array_type (integer_type_node, index), "buf"); field_decl_chain = field_decl; |