aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/Make-lang.in25
-rw-r--r--gcc/fortran/data.c6
3 files changed, 18 insertions, 18 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e1cf74e..06520f2 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-12 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de>
+
+ * Make-lang.in (F95_OBJS, F95_PARSER_OBJS): Alpabetize. Move data.c
+ * data.c (gfc_get_section_index): Remove dependency on trans.h.
+
2004-06-12 Steven G. Kargl <kargls@comcast.net>
* check.c (gfc_check_second_sub, gfc_check_irand, gfc_check_rand
diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in
index 85de74b..572f07a 100644
--- a/gcc/fortran/Make-lang.in
+++ b/gcc/fortran/Make-lang.in
@@ -62,20 +62,20 @@ GFORTRAN_CROSS_NAME = `echo gfortran|sed '$(program_transform_cross_name)'`
# from the parse tree to GENERIC, and F95_ADDITIONAL_OBJS are the files
# from the middle end we depend on.
-F95_PARSER_OBJS = fortran/arith.o fortran/array.o fortran/bbt.o fortran/check.o\
- fortran/decl.o fortran/error.o fortran/expr.o fortran/interface.o \
- fortran/intrinsic.o fortran/io.o fortran/iresolve.o fortran/match.o \
- fortran/matchexp.o fortran/misc.o fortran/module.o fortran/parse.o \
- fortran/primary.o fortran/options.o fortran/resolve.o \
- fortran/scanner.o fortran/simplify.o fortran/st.o fortran/symbol.o \
- fortran/dump-parse-tree.o
+F95_PARSER_OBJS = fortran/arith.o fortran/array.o fortran/bbt.o \
+ fortran/check.o fortran/data.o fortran/decl.o fortran/dump-parse-tree.o \
+ fortran/error.o fortran/expr.o fortran/interface.o \
+ fortran/intrinsic.o fortran/io.o fortran/iresolve.o \
+ fortran/match.o fortran/matchexp.o fortran/misc.o fortran/module.o \
+ fortran/options.o fortran/parse.o fortran/primary.o fortran/resolve.o \
+ fortran/scanner.o fortran/simplify.o fortran/st.o fortran/symbol.o
F95_OBJS = $(F95_PARSER_OBJS) \
- fortran/f95-lang.o fortran/convert.o fortran/trans.o fortran/trans-decl.o \
- fortran/trans-types.o fortran/trans-const.o fortran/trans-expr.o \
- fortran/trans-stmt.o fortran/trans-io.o fortran/trans-array.o \
- fortran/trans-intrinsic.o fortran/dependency.o fortran/trans-common.o \
- fortran/data.o
+ fortran/convert.o fortran/dependency.o fortran/f95-lang.o \
+ fortran/trans.o fortran/trans-array.o fortran/trans-common.o \
+ fortran/trans-const.o fortran/trans-decl.o fortran/trans-expr.o \
+ fortran/trans-intrinsic.o fortran/trans-io.o fortran/trans-stmt.o \
+ fortran/trans-types.o
# FIXME:
# We rely on c-semantics to expand from GIMPLE to RTL.
@@ -278,5 +278,4 @@ fortran/trans-intrinsic.o: $(GFORTRAN_TRANS_DEPS) fortran/mathbuiltins.def \
gt-fortran-trans-intrinsic.h
fortran/dependency.o: fortran/gfortran.h fortran/dependency.h
fortran/trans-common.o: $(GFORTRAN_TRANS_DEPS)
-fortran/data.o: $(GFORTRAN_TRANS_DEPS)
diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c
index 5ffdd5b..ea64f39 100644
--- a/gcc/fortran/data.c
+++ b/gcc/fortran/data.c
@@ -34,12 +34,8 @@ Software Foundation, 59 Temple Place - Suite 330,Boston, MA
trans-array.c. */
#include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "toplev.h"
#include "gfortran.h"
#include "assert.h"
-#include "trans.h"
static void formalize_init_expr (gfc_expr *);
@@ -527,7 +523,7 @@ gfc_get_section_index (gfc_array_ref *ar, mpz_t *section_index, mpz_t *offset)
break;
case DIMEN_VECTOR:
- gfc_todo_error ("Vectors sections in data statements");
+ gfc_internal_error ("TODO: Vector sections in data statements");
default:
abort ();