diff options
| author | Ian Lance Taylor <iant@google.com> | 2009-03-04 15:49:54 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <iant@google.com> | 2009-03-04 15:49:54 +0000 |
| commit | 4f8bf5d5ffae4e8e0db1718db3f5e6391ed246da (patch) | |
| tree | fab05877622a7b2a05de57e8bafdede34c5de6b8 | |
| parent | 67b94c9e3ebc2f0dec7f2bcb0d98b3757bb3459c (diff) | |
* objc/Make-lang.in (cc1obj-dummy$(exeext)): Link with $(CXX).
(cc1obj$(exeext)): Likewise.
* objc/objc-act.c (objc_rewrite_function_call): Change params to
tree.
(objc_gimplify_expr): Change return type to int.
* objc/objc-act.h (objc_gimplify_expr): Update declaration.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-in-cxx@144606 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog.cxx | 7 | ||||
| -rw-r--r-- | gcc/objc/Make-lang.in | 4 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 6 | ||||
| -rw-r--r-- | gcc/objc/objc-act.h | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/gcc/ChangeLog.cxx b/gcc/ChangeLog.cxx index e40804209e0..91413bf7d3d 100644 --- a/gcc/ChangeLog.cxx +++ b/gcc/ChangeLog.cxx @@ -1,5 +1,12 @@ 2009-03-04 Ian Lance Taylor <iant@google.com> + * objc/Make-lang.in (cc1obj-dummy$(exeext)): Link with $(CXX). + (cc1obj$(exeext)): Likewise. + * objc/objc-act.c (objc_rewrite_function_call): Change params to + tree. + (objc_gimplify_expr): Change return type to int. + * objc/objc-act.h (objc_gimplify_expr): Update declaration. + * java/jcf-io.c (find_class): Use CONST_CAST. * fortran/Make-lang.in (gfortranspec.o): Compile with $(CXX). diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index 4f854ea78ae..4af67c2231e 100644 --- a/gcc/objc/Make-lang.in +++ b/gcc/objc/Make-lang.in @@ -52,7 +52,7 @@ OBJC_OBJS = objc/objc-lang.o objc/objc-act.o objc_OBJS = $(OBJC_OBJS) cc1obj-checksum.o cc1obj-dummy$(exeext): $(OBJC_OBJS) $(C_AND_OBJC_OBJS) dummy-checksum.o $(BACKEND) $(LIBDEPS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ + $(CXX) $(ALL_CXXFLAGS) $(LDFLAGS) -o $@ \ $(OBJC_OBJS) $(C_AND_OBJC_OBJS) dummy-checksum.o \ $(BACKEND) $(LIBS) $(BACKENDLIBS) @@ -62,7 +62,7 @@ cc1obj-checksum.c : cc1obj-dummy$(exeext) build/genchecksum$(build_exeext) cc1obj-checksum.o : cc1obj-checksum.c cc1obj$(exeext): $(OBJC_OBJS) $(C_AND_OBJC_OBJS) cc1obj-checksum.o $(BACKEND) $(LIBDEPS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ + $(CXX) $(ALL_CXXFLAGS) $(LDFLAGS) -o $@ \ $(OBJC_OBJS) $(C_AND_OBJC_OBJS) cc1obj-checksum.o \ $(BACKEND) $(LIBS) $(BACKENDLIBS) diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index b440e0cec71..79c6f3b0e8d 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -9490,7 +9490,7 @@ objc_lookup_ivar (tree other, tree id) needs to be done if we are calling a function through a cast. */ tree -objc_rewrite_function_call (tree function, VEC(tree,gc) *params) +objc_rewrite_function_call (tree function, tree params) { if (TREE_CODE (function) == NOP_EXPR && TREE_CODE (TREE_OPERAND (function, 0)) == ADDR_EXPR @@ -9499,7 +9499,7 @@ objc_rewrite_function_call (tree function, VEC(tree,gc) *params) { function = build3 (OBJ_TYPE_REF, TREE_TYPE (function), TREE_OPERAND (function, 0), - VEC_index (tree, params, 0), size_zero_node); + TREE_VALUE (params), size_zero_node); } return function; @@ -9509,7 +9509,7 @@ objc_rewrite_function_call (tree function, VEC(tree,gc) *params) a function in OBJ_TYPE_REF_EXPR (presumably objc_msgSend or one of its cousins). */ -enum gimplify_status +int objc_gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p) { enum gimplify_status r0, r1; diff --git a/gcc/objc/objc-act.h b/gcc/objc/objc-act.h index 6c6b227bd6b..8730447aca9 100644 --- a/gcc/objc/objc-act.h +++ b/gcc/objc/objc-act.h @@ -31,7 +31,7 @@ bool objc_init (void); const char *objc_printable_name (tree, int); void objc_finish_file (void); tree objc_fold_obj_type_ref (tree, tree); -enum gimplify_status objc_gimplify_expr (tree *, gimple_seq *, gimple_seq *); +int objc_gimplify_expr (tree *, gimple_seq *, gimple_seq *); /* NB: The remaining public functions are prototyped in c-common.h, for the benefit of stub-objc.c and objc-act.c. */ |