CVS: sml-dist/src/runtime/objs makefile,1.4,1.5 mk.x86-linux,1.11,1.12

Update of /cvsroot/smlnj/sml-dist/src/runtime/objs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19077/src/runtime/objs

Modified Files:
	makefile mk.x86-linux 
Log Message:
  Cleanup of Linux signal handling plus port to x86-64.


Index: makefile
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/runtime/objs/makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makefile	4 Jan 2001 15:36:41 -0000	1.4
--- makefile	21 Feb 2006 21:33:24 -0000	1.5
***************
*** 356,363 ****
  gen-sizes:	$(CONFIG_DIR)/gen-sizes.c gen-common.o $(CONFIG_DIR)/gen.h \
  		$(INC_DIR)/ml-base.h
! 	$(CC) $(DEFS) $(GEN_INCLUDES) -o gen-sizes $(CONFIG_DIR)/gen-sizes.c gen-common.o
  
  gen-regmask:	$(CONFIG_DIR)/gen-regmask.c gen-common.o $(CONFIG_DIR)/gen.h
! 	$(CC) $(DEFS) $(GEN_INCLUDES) -o gen-regmask $(CONFIG_DIR)/gen-regmask.c gen-common.o
  
  gen-offsets:	$(CONFIG_DIR)/gen-offsets.c gen-common.o $(CONFIG_DIR)/gen.h \
--- 356,363 ----
  gen-sizes:	$(CONFIG_DIR)/gen-sizes.c gen-common.o $(CONFIG_DIR)/gen.h \
  		$(INC_DIR)/ml-base.h
! 	$(CC) $(CFLAGS) $(DEFS) $(GEN_INCLUDES) -o gen-sizes $(CONFIG_DIR)/gen-sizes.c gen-common.o
  
  gen-regmask:	$(CONFIG_DIR)/gen-regmask.c gen-common.o $(CONFIG_DIR)/gen.h
! 	$(CC) $(CFLAGS) $(DEFS) $(GEN_INCLUDES) -o gen-regmask $(CONFIG_DIR)/gen-regmask.c gen-common.o
  
  gen-offsets:	$(CONFIG_DIR)/gen-offsets.c gen-common.o $(CONFIG_DIR)/gen.h \
***************
*** 365,390 ****
  		$(INC_DIR)/ml-base.h $(INC_DIR)/vproc-state.h \
  		$(INC_DIR)/ml-roots.h $(INC_DIR)/ml-state.h
! 	$(CC) $(DEFS) $(GEN_INCLUDES) -o gen-offsets $(CONFIG_DIR)/gen-offsets.c gen-common.o
  
  gen-bc-instr-def:	$(CONFIG_DIR)/gen-bc-instr-def.c \
  		gen-common.o $(CONFIG_DIR)/gen.h \
  		$(BC_DIR)/bc.h $(BC_DIR)/print-bc.h
! 	$(CC) $(GEN_INCLUDES) -I$(BC_DIR) -o gen-bc-instr-def $(CONFIG_DIR)/gen-bc-instr-def.c gen-common.o
  
  gen-unix-signals:	$(CONFIG_DIR)/gen-unix-signals.c \
  		unix-signals.o gen-common.o \
  		$(CONFIG_DIR)/gen.h $(CONFIG_DIR)/gen-unix-signals.h
! 	$(CC) $(GEN_INCLUDES) $(DEFS) -o gen-unix-signals $(CONFIG_DIR)/gen-unix-signals.c unix-signals.o gen-common.o
  
  gen-unix-sigtbl:	$(CONFIG_DIR)/gen-unix-sigtbl.c \
  		gen-common.o unix-signals.o \
  		$(CONFIG_DIR)/gen.h $(CONFIG_DIR)/gen-unix-signals.h
! 	$(CC) $(GEN_INCLUDES) $(DEFS) -o gen-unix-sigtbl $(CONFIG_DIR)/gen-unix-sigtbl.c unix-signals.o gen-common.o
  
  gen-common.o:	$(CONFIG_DIR)/gen-common.c $(CONFIG_DIR)/gen.h
! 	$(CC) -c $(GEN_INCLUDES) $(CONFIG_DIR)/gen-common.c
  
  unix-signals.o:	$(CONFIG_DIR)/unix-signals.c $(CONFIG_DIR)/gen.h
! 	$(CC) -c $(GEN_INCLUDES) $(DEFS) $(CONFIG_DIR)/unix-signals.c
  
  
--- 365,390 ----
  		$(INC_DIR)/ml-base.h $(INC_DIR)/vproc-state.h \
  		$(INC_DIR)/ml-roots.h $(INC_DIR)/ml-state.h
! 	$(CC) $(CFLAGS) $(DEFS) $(GEN_INCLUDES) -o gen-offsets $(CONFIG_DIR)/gen-offsets.c gen-common.o
  
  gen-bc-instr-def:	$(CONFIG_DIR)/gen-bc-instr-def.c \
  		gen-common.o $(CONFIG_DIR)/gen.h \
  		$(BC_DIR)/bc.h $(BC_DIR)/print-bc.h
! 	$(CC) $(CFLAGS) $(GEN_INCLUDES) -I$(BC_DIR) -o gen-bc-instr-def $(CONFIG_DIR)/gen-bc-instr-def.c gen-common.o
  
  gen-unix-signals:	$(CONFIG_DIR)/gen-unix-signals.c \
  		unix-signals.o gen-common.o \
  		$(CONFIG_DIR)/gen.h $(CONFIG_DIR)/gen-unix-signals.h
! 	$(CC) $(CFLAGS) $(GEN_INCLUDES) $(DEFS) -o gen-unix-signals $(CONFIG_DIR)/gen-unix-signals.c unix-signals.o gen-common.o
  
  gen-unix-sigtbl:	$(CONFIG_DIR)/gen-unix-sigtbl.c \
  		gen-common.o unix-signals.o \
  		$(CONFIG_DIR)/gen.h $(CONFIG_DIR)/gen-unix-signals.h
! 	$(CC) $(CFLAGS) $(GEN_INCLUDES) $(DEFS) -o gen-unix-sigtbl $(CONFIG_DIR)/gen-unix-sigtbl.c unix-signals.o gen-common.o
  
  gen-common.o:	$(CONFIG_DIR)/gen-common.c $(CONFIG_DIR)/gen.h
! 	$(CC) -c $(CFLAGS) $(GEN_INCLUDES) $(CONFIG_DIR)/gen-common.c
  
  unix-signals.o:	$(CONFIG_DIR)/unix-signals.c $(CONFIG_DIR)/gen.h
! 	$(CC) -c $(CFLAGS) $(GEN_INCLUDES) $(DEFS) $(CONFIG_DIR)/unix-signals.c
  
  

Index: mk.x86-linux
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/runtime/objs/mk.x86-linux,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mk.x86-linux	18 Jan 2005 16:51:55 -0000	1.11
--- mk.x86-linux	21 Feb 2006 21:33:24 -0000	1.12
***************
*** 5,10 ****
  
  MAKE =		make
  CC =		gcc -ansi
! CFLAGS =	-O2
  CPP =		gcc -x assembler-with-cpp -E -P
  #XOBJS =	xmonitor.o
--- 5,11 ----
  
  MAKE =		make
+ AS =		as --32
  CC =		gcc -ansi
! CFLAGS =	-O2 -m32
  CPP =		gcc -x assembler-with-cpp -E -P
  #XOBJS =	xmonitor.o
***************
*** 16,20 ****
  XDEFS =
  BASE_DEFS =
! DEFS		= $(XDEFS) $(BASE_DEFS) -DHOST_X86 -DTARGET_X86 -DOPSYS_UNIX -DOPSYS_LINUX -D_POSIX_SOURCE -D_BSD_SOURCE -DGNU_ASSEMBLER -DDLOPEN
  TARGET =	X86
  VERSION =	v-x86-linux
--- 17,21 ----
  XDEFS =
  BASE_DEFS =
! DEFS		= $(XDEFS) $(BASE_DEFS) -DHOST_X86 -DTARGET_X86 -DOPSYS_UNIX -DOPSYS_LINUX -D_GNU_SOURCE -DGNU_ASSEMBLER -DDLOPEN
  TARGET =	X86
  VERSION =	v-x86-linux
***************
*** 22,24 ****
  
  all:
! 	($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
--- 23,25 ----
  
  all:
! 	($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642