diff options
| author | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-20 20:02:27 +0000 |
|---|---|---|
| committer | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-20 20:02:27 +0000 |
| commit | de2693559283a5480ce99cb9316b70de84b5948e (patch) | |
| tree | c3e994ea6f3024e8a56160e4c47d32ca1a6a8820 | |
| parent | 31b44d32bb2cf1e8e68863d6c3178abc924e94d7 (diff) | |
| download | ppe42-gcc-de2693559283a5480ce99cb9316b70de84b5948e.tar.gz ppe42-gcc-de2693559283a5480ce99cb9316b70de84b5948e.zip | |
* input.h: Don't #include line-map.h. It may cause link problems
with undefined linemap_line_start when line-map.h is included but
line-map.o is not linked, as currently happens with gengtype on
compilers that don't support inline.
* toplev.c: So we do have to explicitly #include line-map.h here.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78185 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/input.h | 2 | ||||
| -rw-r--r-- | gcc/toplev.c | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6d85b30951f..cfdba5b8733 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2004-02-20 Per Bothner <per@bothner.com> + + * input.h: Don't #include line-map.h. It may cause link problems + with undefined linemap_line_start when line-map.h is included but + line-map.o is not linked, as currently happens with gengtype on + compilers that don't support inline. + * toplev.c: So we do have to explicitly #include line-map.h here. + 2004-02-20 Richard Henderson <rth@redhat.com> * doc/invoke.texi: Add -Wvariadic-macros. diff --git a/gcc/input.h b/gcc/input.h index e1289e56a7c..45fee91d040 100644 --- a/gcc/input.h +++ b/gcc/input.h @@ -22,8 +22,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #ifndef GCC_INPUT_H #define GCC_INPUT_H -#include "line-map.h" - extern struct line_maps line_table; /* The data structure used to record a location in a translation unit. */ diff --git a/gcc/toplev.c b/gcc/toplev.c index def8c9fae9f..071fb5d7e63 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -40,6 +40,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA # include <sys/times.h> #endif +#include "line-map.h" #include "input.h" #include "tree.h" #include "rtl.h" |
