diff options
Diffstat (limited to 'gcc/ch')
-rw-r--r-- | gcc/ch/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/ch/Makefile.in | 5 | ||||
-rw-r--r-- | gcc/ch/decl.c | 47 | ||||
-rw-r--r-- | gcc/ch/timing.c | 5 |
4 files changed, 11 insertions, 52 deletions
diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog index 44049cc..f356ff8 100644 --- a/gcc/ch/ChangeLog +++ b/gcc/ch/ChangeLog @@ -1,3 +1,9 @@ +2000-09-10 Zack Weinberg <zack@wolery.cumb.org> + + * decl.c, timing.c: Include defaults.h if not already included. + Don't define the *_TYPE_SIZE macros. + * Makefile.in: Update dependencies. + 2000-08-29 Zack Weinberg <zack@wolery.cumb.org> * inout.c (add_enum_to_list): Use DECL_NAME directly, don't get diff --git a/gcc/ch/Makefile.in b/gcc/ch/Makefile.in index 70f9071..5b65f12 100644 --- a/gcc/ch/Makefile.in +++ b/gcc/ch/Makefile.in @@ -276,7 +276,7 @@ convert.o : convert.c $(CONFIG_H) $(CHILL_TREE_H) $(srcdir)/../flags.h \ $(srcdir)/../tree.h $(srcdir)/../system.h $(srcdir)/../toplev.h \ $(srcdir)/../convert.h decl.o : decl.c $(CONFIG_H) $(CHILL_TREE_H) $(srcdir)/../flags.h lex.h \ - $(srcdir)/../system.h $(srcdir)/../toplev.h + $(srcdir)/../system.h $(srcdir)/../toplev.h $(srcdir)/../defaults.h except.o : except.c $(CONFIG_H) $(srcdir)/../tree.h $(RTL_H) $(CHILL_TREE_H) \ $(srcdir)/../system.h $(srcdir)/../toplev.h expr.o : expr.c $(CONFIG_H) $(RTL_H) $(CHILL_TREE_H) $(srcdir)/../flags.h \ @@ -300,7 +300,8 @@ parse.o : parse.c $(CONFIG_H) $(CHILL_TREE_H) parse.h \ satisfy.o : satisfy.c $(CONFIG_H) $(CHILL_TREE_H) $(srcdir)/../tree.h \ $(srcdir)/../flags.h lex.h $(srcdir)/../system.h $(srcdir)/../toplev.h timing.o : timing.c $(CONFIG_H) $(CHILL_TREE_H) $(RTL_H) $(srcdir)/../flags.h \ - $(srcdir)/../input.h lex.h $(srcdir)/../system.h $(srcdir)/../toplev.h + $(srcdir)/../input.h lex.h $(srcdir)/../system.h $(srcdir)/../toplev.h \ + $(srcdir)/../defaults.h tasking.o : tasking.c $(CONFIG_H) $(CHILL_TREE_H) $(RTL_H) \ $(srcdir)/../flags.h $(srcdir)/../input.h \ lex.h $(srcdir)/../system.h $(srcdir)/../toplev.h diff --git a/gcc/ch/decl.c b/gcc/ch/decl.c index ba54114..571eaed 100644 --- a/gcc/ch/decl.c +++ b/gcc/ch/decl.c @@ -191,6 +191,7 @@ Boston, MA 02111-1307, USA. */ #include "input.h" #include "rtl.h" #include "toplev.h" +#include "defaults.h" #define IS_UNKNOWN_TYPE(type) (TYPE_SIZE(type)==0) #define BUILTIN_NESTING_LEVEL (-1) @@ -264,52 +265,6 @@ int current_module_nesting_level = 0; /* ??? not all decl nodes are given the most useful possible line numbers. For example, the CONST_DECLs for enum values. */ -#if 0 -/* In grokdeclarator, distinguish syntactic contexts of declarators. */ -enum decl_context -{ NORMAL, /* Ordinary declaration */ - FUNCDEF, /* Function definition */ - PARM, /* Declaration of parm before function body */ - FIELD, /* Declaration inside struct or union */ - BITFIELD, /* Likewise but with specified width */ - TYPENAME}; /* Typename (inside cast or sizeof) */ -#endif - -#ifndef CHAR_TYPE_SIZE -#define CHAR_TYPE_SIZE BITS_PER_UNIT -#endif - -#ifndef SHORT_TYPE_SIZE -#define SHORT_TYPE_SIZE (BITS_PER_UNIT * MIN ((UNITS_PER_WORD + 1) / 2, 2)) -#endif - -#ifndef INT_TYPE_SIZE -#define INT_TYPE_SIZE BITS_PER_WORD -#endif - -#ifndef LONG_TYPE_SIZE -#define LONG_TYPE_SIZE BITS_PER_WORD -#endif - -#ifndef LONG_LONG_TYPE_SIZE -#define LONG_LONG_TYPE_SIZE (BITS_PER_WORD * 2) -#endif - -#ifndef WCHAR_UNSIGNED -#define WCHAR_UNSIGNED 0 -#endif - -#ifndef FLOAT_TYPE_SIZE -#define FLOAT_TYPE_SIZE BITS_PER_WORD -#endif - -#ifndef DOUBLE_TYPE_SIZE -#define DOUBLE_TYPE_SIZE (BITS_PER_WORD * 2) -#endif - -#ifndef LONG_DOUBLE_TYPE_SIZE -#define LONG_DOUBLE_TYPE_SIZE (BITS_PER_WORD * 2) -#endif /* We let tm.h override the types used here, to handle trivial differences such as the choice of unsigned int or long unsigned int for size_t. diff --git a/gcc/ch/timing.c b/gcc/ch/timing.c index 35bef78..53d7670 100644 --- a/gcc/ch/timing.c +++ b/gcc/ch/timing.c @@ -28,10 +28,7 @@ Boston, MA 02111-1307, USA. */ #include "obstack.h" #include "lex.h" #include "toplev.h" - -#ifndef LONG_TYPE_SIZE -#define LONG_TYPE_SIZE BITS_PER_WORD -#endif +#include "defaults.h" /* set non-zero if input text is forced to lowercase */ extern int ignore_case; |