[Dotgnu-pnet-commits] CVS: pnet/engine Makefile.am,1.58,1.59 cvmc.c,1.36,1.37 ilrun.c,1.29,1.30 ilverify.c,1.27,1.28

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/engine
In directory subversions:/tmp/cvs-serv23135/engine

Modified Files:
        Makefile.am cvmc.c ilrun.c ilverify.c 
Log Message:


Add the "--disable-tools" option to "configure" to enable building just
the runtime engine on platforms that cannot support the full developer
toolchain.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/Makefile.am,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** Makefile.am 4 May 2003 21:45:34 -0000       1.58
--- Makefile.am 15 May 2003 04:30:18 -0000      1.59
***************
*** 56,59 ****
--- 56,61 ----
  PACKAGE_LIBS = $(FFILIBS) $(GCLIBS) $(SOCKETLIBS)
  
+ if PNET_TOOLS
+ 
  ilrun_SOURCES = ilrun.c
  ilrun_LDADD = libILEngine.a ../dumpasm/libILDumpAsm.a \
***************
*** 71,74 ****
--- 73,96 ----
  AM_CFLAGS = -I$(top_srcdir)/libffi/include $(NO_GCSE) $(NO_INLINE_FUNCTIONS) \
                        -I$(top_srcdir)/include -I../libffi/include -I.
+ 
+ else
+ 
+ ilrun_SOURCES = ilrun.c
+ ilrun_LDADD = libILEngine.a \
+                         ../image/libILImage.a ../support/libILSupport.a \
+                         $(PACKAGE_LIBS)
+ 
+ ilverify_SOURCES = ilverify.c
+ ilverify_LDADD = libILEngine.a \
+                            ../image/libILImage.a ../support/libILSupport.a \
+                                $(PACKAGE_LIBS)
+ 
+ ## We need "-fno-gcse" to stop gcc being overeager when it compiles
+ ## the interpreter core in direct threading mode.
+ ## 'ffi.h' is autogenerated; thus, goes into build tree.
+ AM_CFLAGS = -I$(top_srcdir)/libffi/include $(NO_GCSE) $(NO_INLINE_FUNCTIONS) \
+                       -I$(top_srcdir)/include -I../libffi/include -I. 
-DIL_WITHOUT_TOOLS
+ 
+ endif
  
  cvm.o: cvm_labels.h

Index: cvmc.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/cvmc.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** cvmc.c      23 Feb 2003 00:04:00 -0000      1.36
--- cvmc.c      15 May 2003 04:30:18 -0000      1.37
***************
*** 262,266 ****
  }
  
! #ifndef IL_CONFIG_REDUCE_CODE
  
  /*
--- 262,266 ----
  }
  
! #if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
  
  /*

Index: ilrun.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/ilrun.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** ilrun.c     22 Feb 2003 12:02:57 -0000      1.29
--- ilrun.c     15 May 2003 04:30:18 -0000      1.30
***************
*** 371,375 ****
        }
  
! #ifndef IL_CONFIG_REDUCE_CODE
        /* Print profile information if requested */
        if(dumpInsnProfile)
--- 371,375 ----
        }
  
! #if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
        /* Print profile information if requested */
        if(dumpInsnProfile)

Index: ilverify.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/ilverify.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** ilverify.c  30 Dec 2002 06:14:41 -0000      1.27
--- ilverify.c  15 May 2003 04:30:18 -0000      1.28
***************
*** 170,173 ****
--- 170,174 ----
  static void printError(ILImage *image, ILMethod *method, const char *msg)
  {
+ #ifndef IL_WITHOUT_TOOLS
        ILDumpMethodType(stdout, image,
                                         ILMethod_Signature(method), 0,
***************
*** 175,178 ****
--- 176,184 ----
                                         ILMethod_Name(method),
                                         method);
+ #else
+       fputs(ILClass_Name(ILMethod_Owner(method)), stdout);
+       fputs(".", stdout);
+       fputs(ILMethod_Name(method), stdout);
+ #endif
        fputs(" - ", stdout);
        fputs(msg, stdout);