From 83afa91b731e958deffb1a65ce26c792779b88f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=B6tz=20Lindenmaier?= Date: Wed, 5 Jul 2000 09:03:18 +0000 Subject: [PATCH] *** empty log message *** [r23] --- Changes | 3 ++- ir/Makefile | 2 +- ir/common/Makefile | 2 +- ir/ir/Makefile | 2 +- ir/ir/irgmod.h | 5 +++++ ir/tr/Makefile | 2 +- ir/tr/type.h | 6 ++++-- ir/tv/Makefile | 2 +- testprograms/Makefile | 2 +- 9 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Changes b/Changes index 090e0eba4..61b624e87 100644 --- a/Changes +++ b/Changes @@ -3,7 +3,8 @@ Moved routines for automatic Phi construction from irgmod to ircons. Sorted functions in ircons to reflect the different interfaces. Renamed dataseg to globals to be conformant with documentation. - Added conservation of current_ir_graph to irgopt.c + Added conservation of current_ir_graph to irgopt.c. + Corrected bug in Makefiles: wrong path to directory ./inlude. 4.7.2000 Goetz Commented a whole bunch of stuff, e.g. in ircons.h (Procedure to construct) diff --git a/ir/Makefile b/ir/Makefile index 12ca79c02..20430844c 100644 --- a/ir/Makefile +++ b/ir/Makefile @@ -12,7 +12,7 @@ # Further it updates the TAGS file with each recompilation SUBDIRS = adt common debug ident ir tr tv -INCLUDES = -I../adt -I../common -I../debug -I../ident -I../include \ +INCLUDES = -I../adt -I../common -I../debug -I../ident -I../../include \ -I../ir -I../tr -I../tv OFILES = diff --git a/ir/common/Makefile b/ir/common/Makefile index 2a2ae3270..df4fa9d6e 100644 --- a/ir/common/Makefile +++ b/ir/common/Makefile @@ -15,7 +15,7 @@ DEPENDFLAGS = -M LIBPATH = LIBS = X_LIBS = -INCLUDES = -I../adt -I../common -I../debug -I../ident -I../include \ +INCLUDES = -I../adt -I../common -I../debug -I../ident -I../../include \ -I../ir -I../tr -I../tv X_INCLUDES = diff --git a/ir/ir/Makefile b/ir/ir/Makefile index 02fb0156a..76f88ab9e 100644 --- a/ir/ir/Makefile +++ b/ir/ir/Makefile @@ -15,7 +15,7 @@ DEPENDFLAGS = -M LIBPATH = LIBS = X_LIBS = -INCLUDES = -I../adt -I../common -I../debug -I../ident -I../include \ +INCLUDES = -I../adt -I../common -I../debug -I../ident -I../../include \ -I../ir -I../tr -I../tv X_INCLUDES = diff --git a/ir/ir/irgmod.h b/ir/ir/irgmod.h index 1d54b30df..7ec6d8211 100644 --- a/ir/ir/irgmod.h +++ b/ir/ir/irgmod.h @@ -6,6 +6,9 @@ ** irgmod.h: ir graph modification */ +# ifndef _IRGMOD_H_ +# define _IRGMOD_H_ + # include "irnode.h" @@ -19,3 +22,5 @@ void turn_into_tuple (ir_node *node, int arity); /* Exchanges two nodes by conserving edges leaving old (i.e., pointers) pointing to old. */ inline void exchange (ir_node *old, ir_node *new); + +#endif /* ifndef _IRGMOD_H_ */ diff --git a/ir/tr/Makefile b/ir/tr/Makefile index aaf3ae2d2..e0f72d8e8 100644 --- a/ir/tr/Makefile +++ b/ir/tr/Makefile @@ -15,7 +15,7 @@ DEPENDFLAGS = -M LIBPATH = LIBS = X_LIBS = -INCLUDES = -I../adt -I../common -I../debug -I../ident -I../include \ +INCLUDES = -I../adt -I../common -I../debug -I../ident -I../../include \ -I../ir -I../tr -I../tv X_INCLUDES = diff --git a/ir/tr/type.h b/ir/tr/type.h index 18f725468..042baae39 100644 --- a/ir/tr/type.h +++ b/ir/tr/type.h @@ -80,12 +80,14 @@ void set_strct_ident (type_strct *strct, ident* ident); typedef struct { firm_kind kind; ident *name; /* do I need the name, - or is the name in entity sufficient? */ + or is the name in entity sufficient? + No, there is no name for the type. Types have + only names if typedef's give them one. */ int arity; /* number of parameters, better n_params */ type **param_type; /* code generation needs this information. Should it be generated by the frontend, or does this impose unnecessary work for - optimizatinos that change the parameters of + optimizations that change the parameters of methods? */ int n_res; /* number of results */ type **res_type; diff --git a/ir/tv/Makefile b/ir/tv/Makefile index 4518b37d7..f9170da62 100644 --- a/ir/tv/Makefile +++ b/ir/tv/Makefile @@ -14,7 +14,7 @@ DEPENDFLAGS = -M LIBPATH = LIBS = X_LIBS = -INCLUDES = -I../adt -I../common -I../debug -I../ident -I../include \ +INCLUDES = -I../adt -I../common -I../debug -I../ident -I../../include \ -I../ir -I../tr -I../tv X_INCLUDES = diff --git a/testprograms/Makefile b/testprograms/Makefile index 0c2673dcf..4ec13dcd7 100644 --- a/testprograms/Makefile +++ b/testprograms/Makefile @@ -1,6 +1,6 @@ DIRS = adt common debug ident ir tr tv -INCDIRS = $(DIRS:%=-I../ir/%) +INCDIRS = $(DIRS:%=-I../ir/%) -I../include LIBDIRS=-L.. -L/usr/public/lib/gmp/ LIBS=-lfirm -lgmp -lm -- 2.20.1