ocaml-opt.patch

   1 diff -urN ocaml-2.02.org/asmrun/Makefile ocaml-2.02/asmrun/Makefile
   2 --- ocaml-2.02.org/asmrun/Makefile      Fri Mar 24 16:57:06 2000
   3 +++ ocaml-2.02/asmrun/Makefile  Fri Mar 24 17:02:22 2000
   4 @@ -2,9 +2,9 @@
   5
   6  CC=$(NATIVECC)
   7  FLAGS=-I../byterun -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM)
   8 -CFLAGS=$(FLAGS) -O $(NATIVECCCOMPOPTS)
   9 +CFLAGS=$(FLAGS) $(NATIVECCCOMPOPTS)
  10  DFLAGS=$(FLAGS) -g -DDEBUG $(NATIVECCCOMPOPTS)
  11 -PFLAGS=$(FLAGS) -pg -O -DPROFILING $(NATIVECCCOMPOPTS)
  12 +PFLAGS=$(FLAGS) -pg -DPROFILING $(NATIVECCCOMPOPTS)
  13
  14  COBJS=startup.o main.o fail.o roots.o signals.o \
  15    misc.o freelist.o major_gc.o minor_gc.o memory.o alloc.o compare.o ints.o \
  16 diff -urN ocaml-2.02.org/byterun/Makefile ocaml-2.02/byterun/Makefile
  17 --- ocaml-2.02.org/byterun/Makefile     Fri Mar 24 16:57:06 2000
  18 +++ ocaml-2.02/byterun/Makefile Fri Mar 24 17:02:37 2000
  19 @@ -1,7 +1,7 @@
  20  include ../config/Makefile
  21
  22  CC=$(BYTECC)
  23 -CFLAGS=-O $(BYTECCCOMPOPTS)
  24 +CFLAGS=$(BYTECCCOMPOPTS)
  25  DFLAGS=-g -DDEBUG $(BYTECCCOMPOPTS)
  26
  27  OBJS=interp.o misc.o stacks.o fix_code.o startup.o main.o \
  28 diff -urN ocaml-2.02.org/configure ocaml-2.02/configure
  29 --- ocaml-2.02.org/configure    Fri Mar 24 16:57:05 2000
  30 +++ ocaml-2.02/configure        Fri Mar 24 16:59:09 2000
  31 @@ -410,7 +410,7 @@
  32
  33  # For the terminfo module
  34
  35 -for libs in "" "-lcurses" "-ltermcap" "-lcurses -ltermcap"; do
  36 +for libs in "" "-ltinfo" "-lcurses" "-ltermcap" "-lcurses -ltermcap"; do
  37    if sh ./hasgot $libs tgetent tgetstr tgetnum tputs; then
  38      echo "termcap functions found (with libraries '$libs')"
  39      echo "#define HAS_TERMCAP" >> s.h
  40 diff -urN ocaml-2.02.org/otherlibs/db/Makefile ocaml-2.02/otherlibs/db/Makefile
  41 --- ocaml-2.02.org/otherlibs/db/Makefile        Fri Mar 24 16:57:10 2000
  42 +++ ocaml-2.02/otherlibs/db/Makefile    Fri Mar 24 17:03:03 2000
  43 @@ -3,10 +3,10 @@
  44  include ../../config/Makefile
  45
  46  # Compilation optiosn
  47 -CC=$(BYTECC) -g
  48 +CC=$(BYTECC)
  49  CAMLC=../../boot/ocamlrun ../../boot/ocamlc -I ../../stdlib
  50  CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
  51 -CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS)
  52 +CFLAGS=-I../../byterun $(BYTECCCOMPOPTS)
  53  COBJS=dbstubs.o
  54
  55  all: libmldb.a db.cmi db.cma
  56 diff -urN ocaml-2.02.org/otherlibs/dbm/Makefile ocaml-2.02/otherlibs/dbm/Makefile
  57 --- ocaml-2.02.org/otherlibs/dbm/Makefile       Fri Mar 24 16:57:10 2000
  58 +++ ocaml-2.02/otherlibs/dbm/Makefile   Fri Mar 24 17:03:13 2000
  59 @@ -3,10 +3,10 @@
  60  include ../../config/Makefile
  61
  62  # Compilation optiosn
  63 -CC=$(BYTECC) -g
  64 +CC=$(BYTECC)
  65  CAMLC=../../boot/ocamlrun ../../boot/ocamlc -I ../../stdlib
  66  CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
  67 -CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS)
  68 +CFLAGS=-I../../byterun $(BYTECCCOMPOPTS)
  69  COBJS=cldbm.o
  70
  71  all: libmldbm.a dbm.cmi dbm.cma
  72 diff -urN ocaml-2.02.org/otherlibs/num/Makefile ocaml-2.02/otherlibs/num/Makefile
  73 --- ocaml-2.02.org/otherlibs/num/Makefile       Fri Mar 24 16:57:10 2000
  74 +++ ocaml-2.02/otherlibs/num/Makefile   Fri Mar 24 17:03:41 2000
  75 @@ -15,7 +15,7 @@
  76
  77  # Compilation options
  78  CC=$(BYTECC)
  79 -CFLAGS=-O -I./bignum/h -I../../byterun $(BYTECCCOMPOPTS)
  80 +CFLAGS=-I./bignum/h -I../../byterun $(BYTECCCOMPOPTS)
  81  CAMLC=../../boot/ocamlrun ../../boot/ocamlc -I ../../stdlib -w s
  82  CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -w s
  83
  84 diff -urN ocaml-2.02.org/otherlibs/str/Makefile ocaml-2.02/otherlibs/str/Makefile
  85 --- ocaml-2.02.org/otherlibs/str/Makefile       Fri Mar 24 16:57:11 2000
  86 +++ ocaml-2.02/otherlibs/str/Makefile   Fri Mar 24 17:04:04 2000
  87 @@ -4,7 +4,7 @@
  88
  89  # Compilation options
  90  CC=$(BYTECC)
  91 -CFLAGS=-O -I$(REGEXLIB) -I../../byterun $(BYTECCCOMPOPTS)
  92 +CFLAGS=-I$(REGEXLIB) -I../../byterun $(BYTECCCOMPOPTS)
  93  CAMLC=../../boot/ocamlrun ../../boot/ocamlc -I ../../stdlib
  94  CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
  95  REGEXLIB=regex-0.12
  96 diff -urN ocaml-2.02.org/otherlibs/systhreads/Makefile ocaml-2.02/otherlibs/systhreads/Makefile
  97 --- ocaml-2.02.org/otherlibs/systhreads/Makefile        Fri Mar 24 16:57:11 2000
  98 +++ ocaml-2.02/otherlibs/systhreads/Makefile    Fri Mar 24 17:04:28 2000
  99 @@ -19,7 +19,7 @@
 100         ar rc libthreads.a $(BYTECODE_C_OBJS)
 101
 102  posix_b.o: posix.c
 103 -       $(BYTECC) -O -I../../byterun $(BYTECCCOMPOPTS) -c posix.c
 104 +       $(BYTECC) -I../../byterun $(BYTECCCOMPOPTS) -c posix.c
 105         mv posix.o posix_b.o
 106
 107  libthreadsnat.a: $(NATIVECODE_C_OBJS)
 108 @@ -27,7 +27,7 @@
 109         ar rc libthreadsnat.a $(NATIVECODE_C_OBJS)
 110
 111  posix_n.o: posix.c
 112 -       $(NATIVECC) -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c posix.c
 113 +       $(NATIVECC) -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c posix.c
 114         mv posix.o posix_n.o
 115
 116  threads.cma: $(THREAD_OBJS)
 117 diff -urN ocaml-2.02.org/otherlibs/threads/Makefile ocaml-2.02/otherlibs/threads/Makefile
 118 --- ocaml-2.02.org/otherlibs/threads/Makefile   Fri Mar 24 16:57:11 2000
 119 +++ ocaml-2.02/otherlibs/threads/Makefile       Fri Mar 24 17:04:43 2000
 120 @@ -1,7 +1,7 @@
 121  include ../../config/Makefile
 122
 123  CC=$(BYTECC)
 124 -CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS)
 125 +CFLAGS=-I../../byterun $(BYTECCCOMPOPTS)
 126  CAMLC=../../boot/ocamlrun ../../boot/ocamlc -I ../../stdlib -I ../unix
 127
 128  C_OBJS=scheduler.o
 129 diff -urN ocaml-2.02.org/otherlibs/unix/Makefile ocaml-2.02/otherlibs/unix/Makefile
 130 --- ocaml-2.02.org/otherlibs/unix/Makefile      Fri Mar 24 16:57:11 2000
 131 +++ ocaml-2.02/otherlibs/unix/Makefile  Fri Mar 24 17:04:53 2000
 132 @@ -4,7 +4,7 @@
 133
 134  # Compilation options
 135  CC=$(BYTECC)
 136 -CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS)
 137 +CFLAGS=-I../../byterun $(BYTECCCOMPOPTS)
 138  CAMLC=../../boot/ocamlrun ../../boot/ocamlc -I ../../stdlib
 139  CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
 140
 141 diff -urN ocaml-2.02.org/yacc/Makefile ocaml-2.02/yacc/Makefile
 142 --- ocaml-2.02.org/yacc/Makefile        Fri Mar 24 16:57:13 2000
 143 +++ ocaml-2.02/yacc/Makefile    Fri Mar 24 17:05:12 2000
 144 @@ -3,7 +3,7 @@
 145  include ../config/Makefile
 146
 147  CC=$(BYTECC)
 148 -CFLAGS=-O -DNDEBUG $(BYTECCCOMPOPTS)
 149 +CFLAGS=-DNDEBUG $(BYTECCCOMPOPTS)
 150
 151  OBJS= closure.o error.o lalr.o lr0.o main.o mkpar.o output.o reader.o \
 152    skeleton.o symtab.o verbose.o warshall.o