diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-01 06:14:40 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-06-01 06:14:40 +0000 |
| commit | fed1769821d234adee6add59bbb97dd1c83ef232 (patch) | |
| tree | f2cf22c041a236c0b6a8c34b163e91103660c904 /gcc/objc | |
| parent | 8e21b71a4f55ebda4156b75b62a9380c082ee5d4 (diff) | |
| download | gcc-fed1769821d234adee6add59bbb97dd1c83ef232.tar.gz | |
2012-06-01 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 188095 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@188099 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/objc/Make-lang.in | 2 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 1 | ||||
| -rw-r--r-- | gcc/objc/objc-next-runtime-abi-01.c | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index ce8dd9ed62a..4d40f3c5d47 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,7 @@ +2012-05-31 Steven Bosscher <steven@gcc.gnu.org> + + * objc-act.c: Do not include output.h. + 2012-05-17 Paolo Carlini <paolo.carlini@oracle.com> PR objc++/53388 diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index 5cca11a6b4d..9399376e437 100644 --- a/gcc/objc/Make-lang.in +++ b/gcc/objc/Make-lang.in @@ -126,7 +126,7 @@ objc/objc-act.o : objc/objc-act.c \ gt-objc-objc-act.h \ $(START_HDRS) \ $(GGC_H) $(DIAGNOSTIC_CORE_H) $(FLAGS_H) input.h \ - toplev.h $(FUNCTION_H) output.h debug.h $(LANGHOOKS_DEF_H) \ + toplev.h $(FUNCTION_H) debug.h $(LANGHOOKS_DEF_H) \ $(HASHTAB_H) $(GIMPLE_H) \ $(C_PRAGMA_H) $(C_TARGET_H) \ objc/objc-encoding.h \ diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index b93948e9ee0..14e1d5f0599 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -43,7 +43,6 @@ along with GCC; see the file COPYING3. If not see #include "objc-map.h" #include "input.h" #include "function.h" -#include "output.h" #include "toplev.h" #include "ggc.h" #include "debug.h" diff --git a/gcc/objc/objc-next-runtime-abi-01.c b/gcc/objc/objc-next-runtime-abi-01.c index a3ca8fcd701..151930e961f 100644 --- a/gcc/objc/objc-next-runtime-abi-01.c +++ b/gcc/objc/objc-next-runtime-abi-01.c @@ -49,7 +49,7 @@ along with GCC; see the file COPYING3. If not see #include "ggc.h" #include "target.h" -#include "output.h" +#include "output.h" /* for asm_out_file */ #include "tree-iterator.h" #include "objc-runtime-hooks.h" |