summaryrefslogtreecommitdiff
path: root/gcc/objc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/objc')
-rw-r--r--gcc/objc/ChangeLog6
-rw-r--r--gcc/objc/config-lang.in2
-rw-r--r--gcc/objc/objc-act.c4
-rw-r--r--gcc/objc/objc-lang.c2
4 files changed, 10 insertions, 4 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 1a4241cc8ab..9934f24d126 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-05 Steven Bosscher <steven@gcc.gnu.org>
+
+ * objc-act.c: Update include path for moved files.
+ * objc-lang.c: Likewise.
+ * config-lang.in: Update paths in gtfiles for files in c-family/.
+
2010-06-01 Nathan Froyd <froydnj@codesourcery.com>
* objc-act.c (build_next_objc_exception_stuff): Give setjmp a
diff --git a/gcc/objc/config-lang.in b/gcc/objc/config-lang.in
index 760b87a1923..1a02b7fe7b1 100644
--- a/gcc/objc/config-lang.in
+++ b/gcc/objc/config-lang.in
@@ -33,4 +33,4 @@ target_libs=target-libobjc
# Most of the object files for cc1obj actually come from C.
lang_requires="c"
-gtfiles="\$(srcdir)/objc/objc-act.h \$(srcdir)/c-parser.c \$(srcdir)/c-tree.h \$(srcdir)/c-decl.c \$(srcdir)/c-objc-common.c \$(srcdir)/c-common.c \$(srcdir)/c-common.h \$(srcdir)/c-pragma.h \$(srcdir)/c-pragma.c \$(srcdir)/objc/objc-act.c"
+gtfiles="\$(srcdir)/objc/objc-act.h \$(srcdir)/c-parser.c \$(srcdir)/c-tree.h \$(srcdir)/c-decl.c \$(srcdir)/c-objc-common.c \$(srcdir)/c-family/c-common.c \$(srcdir)/c-family/c-common.h \$(srcdir)/c-family/c-pragma.h \$(srcdir)/c-family/c-pragma.c \$(srcdir)/objc/objc-act.c"
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 37289a28d2b..f10592fed1e 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -53,8 +53,8 @@ along with GCC; see the file COPYING3. If not see
#include "c-lang.h"
#endif
-#include "c-common.h"
-#include "c-pragma.h"
+#include "c-family/c-common.h"
+#include "c-family/c-pragma.h"
#include "flags.h"
#include "langhooks.h"
#include "objc-act.h"
diff --git a/gcc/objc/objc-lang.c b/gcc/objc/objc-lang.c
index 04cea974f45..fa7496475fb 100644
--- a/gcc/objc/objc-lang.c
+++ b/gcc/objc/objc-lang.c
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3. If not see
#include "tm.h"
#include "tree.h"
#include "c-tree.h"
-#include "c-common.h"
+#include "c-family/c-common.h"
#include "ggc.h"
#include "objc-act.h"
#include "langhooks.h"