[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RFC: lang/ocaml !i386 workaround



Hi!

I have yet to fix the compilation/linking problems for sparc64/macppc
(does anyone give away accounts for testing purposes? :-) but for the
time being I have a workaround, so that on these architectures at least
the bytecode compiler will work. This is inspired by Yozo Toda.

Could someone (pvalchev_(_at_)_? lebel_(_at_)_?) with access to a !i386 please test
the attached diff?

Furthermore if some guru could comment on this approach?

If this gets in, ports depending on ocaml might need patching, but
fortunately we only have two (math/coq and textproc/hevea). :-)

bye,

Nikolay

-- 
OpenPGP: 0x5C0878D2 - BB55 EDCF A1F6 8057 B953  4C66 EFBD BA73 5C08 78D2
diff -uNr --exclude=CVS /usr/ports/lang/ocaml/Makefile ./Makefile
--- /usr/ports/lang/ocaml/Makefile	Mon Sep 16 11:16:20 2002
+++ ./Makefile	Mon Sep 16 11:16:54 2002
@@ -2,9 +2,6 @@
 
 COMMENT=	"ML language based on complete class-based objective system"
 
-# for the time being
-NOT_FOR_ARCHS=	sparc64 macppc
-
 DISTNAME=	ocaml-3.06
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/distrib/${DISTNAME}/
@@ -34,7 +31,15 @@
 
 FAKE_FLAGS=	PREFIX=${WRKINST}${PREFIX}
 USE_GMAKE=	Yes
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc" || \
+	${MACHINE_ARCH} == "alpha"
 ALL_TARGET=	world bootstrap opt opt.opt
+SED_PLIST=	|sed -e '/^%%native%%$$/r${PKGDIR}/PFRAG.native' -e '//d'
+.else
+ALL_TARGET=	world bootstrap
+SED_PLIST=	|sed -e '/^%%native%%$$/d'
+.endif
 
 NO_REGRESS=	Yes
 
diff -uNr --exclude=CVS /usr/ports/lang/ocaml/pkg/PFRAG.native ./pkg/PFRAG.native
--- /usr/ports/lang/ocaml/pkg/PFRAG.native	Thu Jan  1 01:00:00 1970
+++ ./pkg/PFRAG.native	Mon Sep 16 11:18:43 2002
@@ -0,0 +1,195 @@
+_(_at_)_comment $OpenBSD$
+bin/camlp4o.opt
+bin/camlp4r.opt
+bin/ocamlc.opt
+bin/ocamldoc.opt
+bin/ocamllex.opt
+bin/ocamlopt
+bin/ocamlopt.opt
+lib/ocaml/arg.cmx
+lib/ocaml/arith_flags.cmx
+lib/ocaml/arith_status.cmx
+lib/ocaml/array.cmx
+lib/ocaml/arrayLabels.cmx
+lib/ocaml/big_int.cmx
+lib/ocaml/bigarray.a
+lib/ocaml/bigarray.cmx
+lib/ocaml/bigarray.cmxa
+lib/ocaml/buffer.cmx
+lib/ocaml/callback.cmx
+lib/ocaml/camlinternalOO.cmx
+lib/ocaml/camlp4/extfold.cmx
+lib/ocaml/camlp4/extfun.cmx
+lib/ocaml/camlp4/fstream.cmx
+lib/ocaml/camlp4/gramext.cmx
+lib/ocaml/camlp4/gramlib.a
+lib/ocaml/camlp4/gramlib.cmxa
+lib/ocaml/camlp4/grammar.cmx
+lib/ocaml/camlp4/plexer.cmx
+lib/ocaml/camlp4/stdpp.cmx
+lib/ocaml/camlp4/token.cmx
+lib/ocaml/char.cmx
+lib/ocaml/complex.cmx
+lib/ocaml/dbm.a
+lib/ocaml/dbm.cmx
+lib/ocaml/dbm.cmxa
+lib/ocaml/digest.cmx
+lib/ocaml/filename.cmx
+lib/ocaml/format.cmx
+lib/ocaml/gc.cmx
+lib/ocaml/genlex.cmx
+lib/ocaml/graphics.a
+lib/ocaml/graphics.cmxa
+lib/ocaml/hashtbl.cmx
+lib/ocaml/int32.cmx
+lib/ocaml/int64.cmx
+lib/ocaml/int_misc.cmx
+lib/ocaml/labelled.cmx
+lib/ocaml/labltk/balloon.cmx
+lib/ocaml/labltk/bell.cmx
+lib/ocaml/labltk/button.cmx
+lib/ocaml/labltk/cBell.cmx
+lib/ocaml/labltk/cButton.cmx
+lib/ocaml/labltk/cCanvas.cmx
+lib/ocaml/labltk/cCheckbutton.cmx
+lib/ocaml/labltk/cClipboard.cmx
+lib/ocaml/labltk/cDialog.cmx
+lib/ocaml/labltk/cEncoding.cmx
+lib/ocaml/labltk/cEntry.cmx
+lib/ocaml/labltk/cFocus.cmx
+lib/ocaml/labltk/cFont.cmx
+lib/ocaml/labltk/cFrame.cmx
+lib/ocaml/labltk/cGrab.cmx
+lib/ocaml/labltk/cGrid.cmx
+lib/ocaml/labltk/cImage.cmx
+lib/ocaml/labltk/cImagebitmap.cmx
+lib/ocaml/labltk/cImagephoto.cmx
+lib/ocaml/labltk/cLabel.cmx
+lib/ocaml/labltk/cListbox.cmx
+lib/ocaml/labltk/cMenu.cmx
+lib/ocaml/labltk/cMenubutton.cmx
+lib/ocaml/labltk/cMessage.cmx
+lib/ocaml/labltk/cOption.cmx
+lib/ocaml/labltk/cOptionmenu.cmx
+lib/ocaml/labltk/cPack.cmx
+lib/ocaml/labltk/cPalette.cmx
+lib/ocaml/labltk/cPixmap.cmx
+lib/ocaml/labltk/cPlace.cmx
+lib/ocaml/labltk/cRadiobutton.cmx
+lib/ocaml/labltk/cResource.cmx
+lib/ocaml/labltk/cScale.cmx
+lib/ocaml/labltk/cScrollbar.cmx
+lib/ocaml/labltk/cSelection.cmx
+lib/ocaml/labltk/cText.cmx
+lib/ocaml/labltk/cTk.cmx
+lib/ocaml/labltk/cTkvars.cmx
+lib/ocaml/labltk/cTkwait.cmx
+lib/ocaml/labltk/cToplevel.cmx
+lib/ocaml/labltk/cWinfo.cmx
+lib/ocaml/labltk/cWm.cmx
+lib/ocaml/labltk/camltk.cmx
+lib/ocaml/labltk/canvas.cmx
+lib/ocaml/labltk/checkbutton.cmx
+lib/ocaml/labltk/clipboard.cmx
+lib/ocaml/labltk/dialog.cmx
+lib/ocaml/labltk/encoding.cmx
+lib/ocaml/labltk/entry.cmx
+lib/ocaml/labltk/fileselect.cmx
+lib/ocaml/labltk/focus.cmx
+lib/ocaml/labltk/font.cmx
+lib/ocaml/labltk/frame.cmx
+lib/ocaml/labltk/frxlib.a
+lib/ocaml/labltk/frxlib.cmxa
+lib/ocaml/labltk/grab.cmx
+lib/ocaml/labltk/grid.cmx
+lib/ocaml/labltk/image.cmx
+lib/ocaml/labltk/imagebitmap.cmx
+lib/ocaml/labltk/imagephoto.cmx
+lib/ocaml/labltk/jpf_font.cmx
+lib/ocaml/labltk/jpflib.a
+lib/ocaml/labltk/jpflib.cmxa
+lib/ocaml/labltk/label.cmx
+lib/ocaml/labltk/labltk.a
+lib/ocaml/labltk/labltk.cmx
+lib/ocaml/labltk/labltk.cmxa
+lib/ocaml/labltk/listbox.cmx
+lib/ocaml/labltk/menu.cmx
+lib/ocaml/labltk/menubutton.cmx
+lib/ocaml/labltk/message.cmx
+lib/ocaml/labltk/option.cmx
+lib/ocaml/labltk/optionmenu.cmx
+lib/ocaml/labltk/pack.cmx
+lib/ocaml/labltk/palette.cmx
+lib/ocaml/labltk/pixmap.cmx
+lib/ocaml/labltk/place.cmx
+lib/ocaml/labltk/radiobutton.cmx
+lib/ocaml/labltk/scale.cmx
+lib/ocaml/labltk/scrollbar.cmx
+lib/ocaml/labltk/selection.cmx
+lib/ocaml/labltk/shell.cmx
+lib/ocaml/labltk/text.cmx
+lib/ocaml/labltk/tk.cmx
+lib/ocaml/labltk/tkanim.a
+lib/ocaml/labltk/tkanim.cmxa
+lib/ocaml/labltk/tkvars.cmx
+lib/ocaml/labltk/tkwait.cmx
+lib/ocaml/labltk/toplevel.cmx
+lib/ocaml/labltk/winfo.cmx
+lib/ocaml/labltk/wm.cmx
+lib/ocaml/lazy.cmx
+lib/ocaml/lexing.cmx
+lib/ocaml/libasmrun.a
+lib/ocaml/libasmrunp.a
+lib/ocaml/list.cmx
+lib/ocaml/listLabels.cmx
+lib/ocaml/map.cmx
+lib/ocaml/marshal.cmx
+lib/ocaml/moreLabels.cmx
+lib/ocaml/nat.cmx
+lib/ocaml/nativeint.cmx
+lib/ocaml/num.cmx
+lib/ocaml/nums.a
+lib/ocaml/nums.cmxa
+lib/ocaml/obj.cmx
+lib/ocaml/ocamldoc/odoc_info.a
+lib/ocaml/ocamldoc/odoc_info.cmxa
+lib/ocaml/ocamldoc/odoc_opt.cmi
+lib/ocaml/oo.cmx
+lib/ocaml/parsing.cmx
+lib/ocaml/pervasives.cmx
+lib/ocaml/printexc.cmx
+lib/ocaml/printf.cmx
+lib/ocaml/queue.cmx
+lib/ocaml/random.cmx
+lib/ocaml/ratio.cmx
+lib/ocaml/scanf.cmx
+lib/ocaml/set.cmx
+lib/ocaml/sort.cmx
+lib/ocaml/stack.cmx
+lib/ocaml/stdLabels.cmx
+lib/ocaml/std_exit.cmx
+lib/ocaml/std_exit.o
+lib/ocaml/std_exit.p.cmx
+lib/ocaml/std_exit.p.o
+lib/ocaml/stdlib.a
+lib/ocaml/stdlib.cmxa
+lib/ocaml/stdlib.p.a
+lib/ocaml/stdlib.p.cmxa
+lib/ocaml/str.a
+lib/ocaml/str.cmx
+lib/ocaml/str.cmxa
+lib/ocaml/stream.cmx
+lib/ocaml/string.cmx
+lib/ocaml/stringLabels.cmx
+lib/ocaml/string_misc.cmx
+lib/ocaml/sys.cmx
+lib/ocaml/unix.a
+lib/ocaml/unix.cmx
+lib/ocaml/unix.cmxa
+lib/ocaml/unixLabels.cmx
+lib/ocaml/weak.cmx
+man/man1/camlp4o.opt.1
+man/man1/camlp4r.opt.1
+man/man1/ocamlc.opt.1
+man/man1/ocamlopt.1
+man/man1/ocamlopt.opt.1
diff -uNr --exclude=CVS /usr/ports/lang/ocaml/pkg/PLIST ./pkg/PLIST
--- /usr/ports/lang/ocaml/pkg/PLIST	Sun Aug 25 22:44:40 2002
+++ ./pkg/PLIST	Mon Sep 16 11:18:07 2002
@@ -1,62 +1,45 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.9 2002/08/25 20:44:40 naddy Exp $
+_(_at_)_comment $OpenBSD$
+%%native%%
 bin/camlp4
 bin/camlp4o
-bin/camlp4o.opt
 bin/camlp4r
-bin/camlp4r.opt
 bin/labltk
 bin/mkcamlp4
 bin/ocaml
 bin/ocamlbrowser
 bin/ocamlc
-bin/ocamlc.opt
 bin/ocamlcp
 bin/ocamldebug
 bin/ocamldep
 bin/ocamldoc
-bin/ocamldoc.opt
 bin/ocamllex
-bin/ocamllex.opt
 bin/ocamlmklib
 bin/ocamlmktop
-bin/ocamlopt
-bin/ocamlopt.opt
 bin/ocamlprof
 bin/ocamlrun
 bin/ocamlyacc
 bin/ocpp
 lib/ocaml/addlabels
 lib/ocaml/arg.cmi
-lib/ocaml/arg.cmx
 lib/ocaml/arg.ml
 lib/ocaml/arg.mli
-lib/ocaml/arith_flags.cmx
 lib/ocaml/arith_status.cmi
-lib/ocaml/arith_status.cmx
 lib/ocaml/arith_status.mli
 lib/ocaml/array.cmi
-lib/ocaml/array.cmx
 lib/ocaml/array.ml
 lib/ocaml/array.mli
 lib/ocaml/arrayLabels.cmi
-lib/ocaml/arrayLabels.cmx
 lib/ocaml/arrayLabels.ml
 lib/ocaml/arrayLabels.mli
 lib/ocaml/big_int.cmi
-lib/ocaml/big_int.cmx
 lib/ocaml/big_int.mli
-lib/ocaml/bigarray.a
 lib/ocaml/bigarray.cma
 lib/ocaml/bigarray.cmi
-lib/ocaml/bigarray.cmx
-lib/ocaml/bigarray.cmxa
 lib/ocaml/bigarray.mli
 lib/ocaml/buffer.cmi
-lib/ocaml/buffer.cmx
 lib/ocaml/buffer.ml
 lib/ocaml/buffer.mli
 lib/ocaml/callback.cmi
-lib/ocaml/callback.cmx
 lib/ocaml/callback.ml
 lib/ocaml/callback.mli
 lib/ocaml/caml/alloc.h
@@ -72,7 +55,6 @@
 lib/ocaml/camlheader
 lib/ocaml/camlheader_ur
 lib/ocaml/camlinternalOO.cmi
-lib/ocaml/camlinternalOO.cmx
 lib/ocaml/camlinternalOO.ml
 lib/ocaml/camlinternalOO.mli
 lib/ocaml/camlp4/ast2pt.cmi
@@ -83,22 +65,15 @@
 lib/ocaml/camlp4/camlp4r.cma
 lib/ocaml/camlp4/crc.cmo
 lib/ocaml/camlp4/extfold.cmi
-lib/ocaml/camlp4/extfold.cmx
 lib/ocaml/camlp4/extfold.mli
 lib/ocaml/camlp4/extfun.cmi
-lib/ocaml/camlp4/extfun.cmx
 lib/ocaml/camlp4/extfun.mli
 lib/ocaml/camlp4/fstream.cmi
-lib/ocaml/camlp4/fstream.cmx
 lib/ocaml/camlp4/fstream.mli
 lib/ocaml/camlp4/gramext.cmi
-lib/ocaml/camlp4/gramext.cmx
 lib/ocaml/camlp4/gramext.mli
-lib/ocaml/camlp4/gramlib.a
 lib/ocaml/camlp4/gramlib.cma
-lib/ocaml/camlp4/gramlib.cmxa
 lib/ocaml/camlp4/grammar.cmi
-lib/ocaml/camlp4/grammar.cmx
 lib/ocaml/camlp4/grammar.mli
 lib/ocaml/camlp4/lib.sml
 lib/ocaml/camlp4/mLast.cmi
@@ -130,7 +105,6 @@
 lib/ocaml/camlp4/pcaml.cmi
 lib/ocaml/camlp4/pcaml.mli
 lib/ocaml/camlp4/plexer.cmi
-lib/ocaml/camlp4/plexer.cmx
 lib/ocaml/camlp4/plexer.mli
 lib/ocaml/camlp4/pr_depend.cmo
 lib/ocaml/camlp4/pr_dump.cmo
@@ -148,28 +122,20 @@
 lib/ocaml/camlp4/spretty.cmi
 lib/ocaml/camlp4/spretty.mli
 lib/ocaml/camlp4/stdpp.cmi
-lib/ocaml/camlp4/stdpp.cmx
 lib/ocaml/camlp4/stdpp.mli
 lib/ocaml/camlp4/token.cmi
-lib/ocaml/camlp4/token.cmx
 lib/ocaml/camlp4/token.mli
 lib/ocaml/char.cmi
-lib/ocaml/char.cmx
 lib/ocaml/char.ml
 lib/ocaml/char.mli
 lib/ocaml/complex.cmi
-lib/ocaml/complex.cmx
 lib/ocaml/complex.ml
 lib/ocaml/complex.mli
 lib/ocaml/condition.mli
-lib/ocaml/dbm.a
 lib/ocaml/dbm.cma
 lib/ocaml/dbm.cmi
-lib/ocaml/dbm.cmx
-lib/ocaml/dbm.cmxa
 lib/ocaml/dbm.mli
 lib/ocaml/digest.cmi
-lib/ocaml/digest.cmx
 lib/ocaml/digest.ml
 lib/ocaml/digest.mli
 lib/ocaml/dynlink.cma
@@ -179,200 +145,136 @@
 lib/ocaml/expunge
 lib/ocaml/extract_crc
 lib/ocaml/filename.cmi
-lib/ocaml/filename.cmx
 lib/ocaml/filename.ml
 lib/ocaml/filename.mli
 lib/ocaml/format.cmi
-lib/ocaml/format.cmx
 lib/ocaml/format.ml
 lib/ocaml/format.mli
 lib/ocaml/gc.cmi
-lib/ocaml/gc.cmx
 lib/ocaml/gc.ml
 lib/ocaml/gc.mli
 lib/ocaml/genlex.cmi
-lib/ocaml/genlex.cmx
 lib/ocaml/genlex.ml
 lib/ocaml/genlex.mli
-lib/ocaml/graphics.a
 lib/ocaml/graphics.cma
 lib/ocaml/graphics.cmi
-lib/ocaml/graphics.cmxa
 lib/ocaml/graphics.mli
 lib/ocaml/graphicsX11.cmi
 lib/ocaml/graphicsX11.mli
 lib/ocaml/hashtbl.cmi
-lib/ocaml/hashtbl.cmx
 lib/ocaml/hashtbl.ml
 lib/ocaml/hashtbl.mli
 lib/ocaml/int32.cmi
-lib/ocaml/int32.cmx
 lib/ocaml/int32.ml
 lib/ocaml/int32.mli
 lib/ocaml/int64.cmi
-lib/ocaml/int64.cmx
 lib/ocaml/int64.ml
 lib/ocaml/int64.mli
-lib/ocaml/int_misc.cmx
-lib/ocaml/labelled.cmx
 lib/ocaml/labltk/balloon.cmi
-lib/ocaml/labltk/balloon.cmx
 lib/ocaml/labltk/balloon.mli
 lib/ocaml/labltk/bell.cmi
-lib/ocaml/labltk/bell.cmx
 lib/ocaml/labltk/bell.mli
 lib/ocaml/labltk/button.cmi
-lib/ocaml/labltk/button.cmx
 lib/ocaml/labltk/button.mli
 lib/ocaml/labltk/cBell.cmi
-lib/ocaml/labltk/cBell.cmx
 lib/ocaml/labltk/cBell.mli
 lib/ocaml/labltk/cButton.cmi
-lib/ocaml/labltk/cButton.cmx
 lib/ocaml/labltk/cButton.mli
 lib/ocaml/labltk/cCanvas.cmi
-lib/ocaml/labltk/cCanvas.cmx
 lib/ocaml/labltk/cCanvas.mli
 lib/ocaml/labltk/cCheckbutton.cmi
-lib/ocaml/labltk/cCheckbutton.cmx
 lib/ocaml/labltk/cCheckbutton.mli
 lib/ocaml/labltk/cClipboard.cmi
-lib/ocaml/labltk/cClipboard.cmx
 lib/ocaml/labltk/cClipboard.mli
 lib/ocaml/labltk/cDialog.cmi
-lib/ocaml/labltk/cDialog.cmx
 lib/ocaml/labltk/cDialog.mli
 lib/ocaml/labltk/cEncoding.cmi
-lib/ocaml/labltk/cEncoding.cmx
 lib/ocaml/labltk/cEncoding.mli
 lib/ocaml/labltk/cEntry.cmi
-lib/ocaml/labltk/cEntry.cmx
 lib/ocaml/labltk/cEntry.mli
 lib/ocaml/labltk/cFocus.cmi
-lib/ocaml/labltk/cFocus.cmx
 lib/ocaml/labltk/cFocus.mli
 lib/ocaml/labltk/cFont.cmi
-lib/ocaml/labltk/cFont.cmx
 lib/ocaml/labltk/cFont.mli
 lib/ocaml/labltk/cFrame.cmi
-lib/ocaml/labltk/cFrame.cmx
 lib/ocaml/labltk/cFrame.mli
 lib/ocaml/labltk/cGrab.cmi
-lib/ocaml/labltk/cGrab.cmx
 lib/ocaml/labltk/cGrab.mli
 lib/ocaml/labltk/cGrid.cmi
-lib/ocaml/labltk/cGrid.cmx
 lib/ocaml/labltk/cGrid.mli
 lib/ocaml/labltk/cImage.cmi
-lib/ocaml/labltk/cImage.cmx
 lib/ocaml/labltk/cImage.mli
 lib/ocaml/labltk/cImagebitmap.cmi
-lib/ocaml/labltk/cImagebitmap.cmx
 lib/ocaml/labltk/cImagebitmap.mli
 lib/ocaml/labltk/cImagephoto.cmi
-lib/ocaml/labltk/cImagephoto.cmx
 lib/ocaml/labltk/cImagephoto.mli
 lib/ocaml/labltk/cLabel.cmi
-lib/ocaml/labltk/cLabel.cmx
 lib/ocaml/labltk/cLabel.mli
 lib/ocaml/labltk/cListbox.cmi
-lib/ocaml/labltk/cListbox.cmx
 lib/ocaml/labltk/cListbox.mli
 lib/ocaml/labltk/cMenu.cmi
-lib/ocaml/labltk/cMenu.cmx
 lib/ocaml/labltk/cMenu.mli
 lib/ocaml/labltk/cMenubutton.cmi
-lib/ocaml/labltk/cMenubutton.cmx
 lib/ocaml/labltk/cMenubutton.mli
 lib/ocaml/labltk/cMessage.cmi
-lib/ocaml/labltk/cMessage.cmx
 lib/ocaml/labltk/cMessage.mli
 lib/ocaml/labltk/cOption.cmi
-lib/ocaml/labltk/cOption.cmx
 lib/ocaml/labltk/cOption.mli
 lib/ocaml/labltk/cOptionmenu.cmi
-lib/ocaml/labltk/cOptionmenu.cmx
 lib/ocaml/labltk/cOptionmenu.mli
 lib/ocaml/labltk/cPack.cmi
-lib/ocaml/labltk/cPack.cmx
 lib/ocaml/labltk/cPack.mli
 lib/ocaml/labltk/cPalette.cmi
-lib/ocaml/labltk/cPalette.cmx
 lib/ocaml/labltk/cPalette.mli
 lib/ocaml/labltk/cPixmap.cmi
-lib/ocaml/labltk/cPixmap.cmx
 lib/ocaml/labltk/cPixmap.mli
 lib/ocaml/labltk/cPlace.cmi
-lib/ocaml/labltk/cPlace.cmx
 lib/ocaml/labltk/cPlace.mli
 lib/ocaml/labltk/cRadiobutton.cmi
-lib/ocaml/labltk/cRadiobutton.cmx
 lib/ocaml/labltk/cRadiobutton.mli
 lib/ocaml/labltk/cResource.cmi
-lib/ocaml/labltk/cResource.cmx
 lib/ocaml/labltk/cResource.mli
 lib/ocaml/labltk/cScale.cmi
-lib/ocaml/labltk/cScale.cmx
 lib/ocaml/labltk/cScale.mli
 lib/ocaml/labltk/cScrollbar.cmi
-lib/ocaml/labltk/cScrollbar.cmx
 lib/ocaml/labltk/cScrollbar.mli
 lib/ocaml/labltk/cSelection.cmi
-lib/ocaml/labltk/cSelection.cmx
 lib/ocaml/labltk/cSelection.mli
 lib/ocaml/labltk/cText.cmi
-lib/ocaml/labltk/cText.cmx
 lib/ocaml/labltk/cText.mli
 lib/ocaml/labltk/cTk.cmi
-lib/ocaml/labltk/cTk.cmx
 lib/ocaml/labltk/cTkvars.cmi
-lib/ocaml/labltk/cTkvars.cmx
 lib/ocaml/labltk/cTkvars.mli
 lib/ocaml/labltk/cTkwait.cmi
-lib/ocaml/labltk/cTkwait.cmx
 lib/ocaml/labltk/cTkwait.mli
 lib/ocaml/labltk/cToplevel.cmi
-lib/ocaml/labltk/cToplevel.cmx
 lib/ocaml/labltk/cToplevel.mli
 lib/ocaml/labltk/cWinfo.cmi
-lib/ocaml/labltk/cWinfo.cmx
 lib/ocaml/labltk/cWinfo.mli
 lib/ocaml/labltk/cWm.cmi
-lib/ocaml/labltk/cWm.cmx
 lib/ocaml/labltk/cWm.mli
 lib/ocaml/labltk/camltk.cmi
-lib/ocaml/labltk/camltk.cmx
 lib/ocaml/labltk/canvas.cmi
-lib/ocaml/labltk/canvas.cmx
 lib/ocaml/labltk/canvas.mli
 lib/ocaml/labltk/checkbutton.cmi
-lib/ocaml/labltk/checkbutton.cmx
 lib/ocaml/labltk/checkbutton.mli
 lib/ocaml/labltk/clipboard.cmi
-lib/ocaml/labltk/clipboard.cmx
 lib/ocaml/labltk/clipboard.mli
 lib/ocaml/labltk/dialog.cmi
-lib/ocaml/labltk/dialog.cmx
 lib/ocaml/labltk/dialog.mli
 lib/ocaml/labltk/encoding.cmi
-lib/ocaml/labltk/encoding.cmx
 lib/ocaml/labltk/encoding.mli
 lib/ocaml/labltk/entry.cmi
-lib/ocaml/labltk/entry.cmx
 lib/ocaml/labltk/entry.mli
 lib/ocaml/labltk/fileevent.cmi
 lib/ocaml/labltk/fileevent.mli
 lib/ocaml/labltk/fileselect.cmi
-lib/ocaml/labltk/fileselect.cmx
 lib/ocaml/labltk/fileselect.mli
 lib/ocaml/labltk/focus.cmi
-lib/ocaml/labltk/focus.cmx
 lib/ocaml/labltk/focus.mli
 lib/ocaml/labltk/font.cmi
-lib/ocaml/labltk/font.cmx
 lib/ocaml/labltk/font.mli
 lib/ocaml/labltk/frame.cmi
-lib/ocaml/labltk/frame.cmx
 lib/ocaml/labltk/frame.mli
 lib/ocaml/labltk/frx_after.cmi
 lib/ocaml/labltk/frx_after.mli
@@ -412,134 +314,92 @@
 lib/ocaml/labltk/frx_toplevel.mli
 lib/ocaml/labltk/frx_widget.cmi
 lib/ocaml/labltk/frx_widget.mli
-lib/ocaml/labltk/frxlib.a
 lib/ocaml/labltk/frxlib.cma
-lib/ocaml/labltk/frxlib.cmxa
 lib/ocaml/labltk/grab.cmi
-lib/ocaml/labltk/grab.cmx
 lib/ocaml/labltk/grab.mli
 lib/ocaml/labltk/grid.cmi
-lib/ocaml/labltk/grid.cmx
 lib/ocaml/labltk/grid.mli
 lib/ocaml/labltk/image.cmi
-lib/ocaml/labltk/image.cmx
 lib/ocaml/labltk/image.mli
 lib/ocaml/labltk/imagebitmap.cmi
-lib/ocaml/labltk/imagebitmap.cmx
 lib/ocaml/labltk/imagebitmap.mli
 lib/ocaml/labltk/imagephoto.cmi
-lib/ocaml/labltk/imagephoto.cmx
 lib/ocaml/labltk/imagephoto.mli
 lib/ocaml/labltk/jpf_font.cmi
-lib/ocaml/labltk/jpf_font.cmx
 lib/ocaml/labltk/jpf_font.mli
-lib/ocaml/labltk/jpflib.a
 lib/ocaml/labltk/jpflib.cma
-lib/ocaml/labltk/jpflib.cmxa
 lib/ocaml/labltk/label.cmi
-lib/ocaml/labltk/label.cmx
 lib/ocaml/labltk/label.mli
-lib/ocaml/labltk/labltk.a
 lib/ocaml/labltk/labltk.cma
 lib/ocaml/labltk/labltk.cmi
-lib/ocaml/labltk/labltk.cmx
-lib/ocaml/labltk/labltk.cmxa
 lib/ocaml/labltk/labltktop
 lib/ocaml/labltk/liblabltk.a
 lib/ocaml/labltk/libtkanim.a
 lib/ocaml/labltk/listbox.cmi
-lib/ocaml/labltk/listbox.cmx
 lib/ocaml/labltk/listbox.mli
 lib/ocaml/labltk/menu.cmi
-lib/ocaml/labltk/menu.cmx
 lib/ocaml/labltk/menu.mli
 lib/ocaml/labltk/menubutton.cmi
-lib/ocaml/labltk/menubutton.cmx
 lib/ocaml/labltk/menubutton.mli
 lib/ocaml/labltk/message.cmi
-lib/ocaml/labltk/message.cmx
 lib/ocaml/labltk/message.mli
 lib/ocaml/labltk/option.cmi
-lib/ocaml/labltk/option.cmx
 lib/ocaml/labltk/option.mli
 lib/ocaml/labltk/optionmenu.cmi
-lib/ocaml/labltk/optionmenu.cmx
 lib/ocaml/labltk/optionmenu.mli
 lib/ocaml/labltk/pack.cmi
-lib/ocaml/labltk/pack.cmx
 lib/ocaml/labltk/pack.mli
 lib/ocaml/labltk/palette.cmi
-lib/ocaml/labltk/palette.cmx
 lib/ocaml/labltk/palette.mli
 lib/ocaml/labltk/pixmap.cmi
-lib/ocaml/labltk/pixmap.cmx
 lib/ocaml/labltk/pixmap.mli
 lib/ocaml/labltk/place.cmi
-lib/ocaml/labltk/place.cmx
 lib/ocaml/labltk/place.mli
 lib/ocaml/labltk/pp
 lib/ocaml/labltk/protocol.cmi
 lib/ocaml/labltk/protocol.mli
 lib/ocaml/labltk/radiobutton.cmi
-lib/ocaml/labltk/radiobutton.cmx
 lib/ocaml/labltk/radiobutton.mli
 lib/ocaml/labltk/rawwidget.cmi
 lib/ocaml/labltk/rawwidget.mli
 lib/ocaml/labltk/scale.cmi
-lib/ocaml/labltk/scale.cmx
 lib/ocaml/labltk/scale.mli
 lib/ocaml/labltk/scrollbar.cmi
-lib/ocaml/labltk/scrollbar.cmx
 lib/ocaml/labltk/scrollbar.mli
 lib/ocaml/labltk/selection.cmi
-lib/ocaml/labltk/selection.cmx
 lib/ocaml/labltk/selection.mli
 lib/ocaml/labltk/shell.cmi
-lib/ocaml/labltk/shell.cmx
 lib/ocaml/labltk/shell.mli
 lib/ocaml/labltk/text.cmi
-lib/ocaml/labltk/text.cmx
 lib/ocaml/labltk/text.mli
 lib/ocaml/labltk/textvariable.cmi
 lib/ocaml/labltk/textvariable.mli
 lib/ocaml/labltk/timer.cmi
 lib/ocaml/labltk/timer.mli
 lib/ocaml/labltk/tk.cmi
-lib/ocaml/labltk/tk.cmx
-lib/ocaml/labltk/tkanim.a
 lib/ocaml/labltk/tkanim.cma
 lib/ocaml/labltk/tkanim.cmi
-lib/ocaml/labltk/tkanim.cmxa
 lib/ocaml/labltk/tkanim.mli
 lib/ocaml/labltk/tkcompiler
 lib/ocaml/labltk/tkvars.cmi
-lib/ocaml/labltk/tkvars.cmx
 lib/ocaml/labltk/tkvars.mli
 lib/ocaml/labltk/tkwait.cmi
-lib/ocaml/labltk/tkwait.cmx
 lib/ocaml/labltk/tkwait.mli
 lib/ocaml/labltk/toplevel.cmi
-lib/ocaml/labltk/toplevel.cmx
 lib/ocaml/labltk/toplevel.mli
 lib/ocaml/labltk/widget.cmi
 lib/ocaml/labltk/widget.mli
 lib/ocaml/labltk/winfo.cmi
-lib/ocaml/labltk/winfo.cmx
 lib/ocaml/labltk/winfo.mli
 lib/ocaml/labltk/wm.cmi
-lib/ocaml/labltk/wm.cmx
 lib/ocaml/labltk/wm.mli
 lib/ocaml/lazy.cmi
-lib/ocaml/lazy.cmx
 lib/ocaml/lazy.ml
 lib/ocaml/lazy.mli
 lib/ocaml/ld.conf
 lib/ocaml/lexing.cmi
-lib/ocaml/lexing.cmx
 lib/ocaml/lexing.ml
 lib/ocaml/lexing.mli
-lib/ocaml/libasmrun.a
-lib/ocaml/libasmrunp.a
 lib/ocaml/libbigarray.a
 lib/ocaml/libcamlrun.a
 lib/ocaml/libgraphics.a
@@ -549,41 +409,30 @@
 lib/ocaml/libthreads.a
 lib/ocaml/libunix.a
 lib/ocaml/list.cmi
-lib/ocaml/list.cmx
 lib/ocaml/list.ml
 lib/ocaml/list.mli
 lib/ocaml/listLabels.cmi
-lib/ocaml/listLabels.cmx
 lib/ocaml/listLabels.ml
 lib/ocaml/listLabels.mli
 lib/ocaml/map.cmi
-lib/ocaml/map.cmx
 lib/ocaml/map.ml
 lib/ocaml/map.mli
 lib/ocaml/marshal.cmi
-lib/ocaml/marshal.cmx
 lib/ocaml/marshal.ml
 lib/ocaml/marshal.mli
 lib/ocaml/moreLabels.cmi
-lib/ocaml/moreLabels.cmx
 lib/ocaml/moreLabels.ml
 lib/ocaml/moreLabels.mli
 lib/ocaml/mutex.mli
 lib/ocaml/nat.cmi
-lib/ocaml/nat.cmx
 lib/ocaml/nat.mli
 lib/ocaml/nativeint.cmi
-lib/ocaml/nativeint.cmx
 lib/ocaml/nativeint.ml
 lib/ocaml/nativeint.mli
 lib/ocaml/num.cmi
-lib/ocaml/num.cmx
 lib/ocaml/num.mli
-lib/ocaml/nums.a
 lib/ocaml/nums.cma
-lib/ocaml/nums.cmxa
 lib/ocaml/obj.cmi
-lib/ocaml/obj.cmx
 lib/ocaml/obj.ml
 lib/ocaml/obj.mli
 lib/ocaml/ocamldoc/ocamldoc.hva
@@ -605,10 +454,8 @@
 lib/ocaml/ocamldoc/odoc_exception.cmi
 lib/ocaml/ocamldoc/odoc_global.cmi
 lib/ocaml/ocamldoc/odoc_html.cmi
-lib/ocaml/ocamldoc/odoc_info.a
 lib/ocaml/ocamldoc/odoc_info.cma
 lib/ocaml/ocamldoc/odoc_info.cmi
-lib/ocaml/ocamldoc/odoc_info.cmxa
 lib/ocaml/ocamldoc/odoc_info.mli
 lib/ocaml/ocamldoc/odoc_inherit.cmi
 lib/ocaml/ocamldoc/odoc_latex.cmi
@@ -620,7 +467,6 @@
 lib/ocaml/ocamldoc/odoc_module.cmi
 lib/ocaml/ocamldoc/odoc_name.cmi
 lib/ocaml/ocamldoc/odoc_ocamlhtml.cmi
-lib/ocaml/ocamldoc/odoc_opt.cmi
 lib/ocaml/ocamldoc/odoc_parameter.cmi
 lib/ocaml/ocamldoc/odoc_parser.cmi
 lib/ocaml/ocamldoc/odoc_scan.cmi
@@ -637,94 +483,65 @@
 lib/ocaml/ocamldoc/odoc_types.cmi
 lib/ocaml/ocamldoc/odoc_value.cmi
 lib/ocaml/oo.cmi
-lib/ocaml/oo.cmx
 lib/ocaml/oo.ml
 lib/ocaml/oo.mli
 lib/ocaml/outcometree.cmi
 lib/ocaml/outcometree.mli
 lib/ocaml/parsing.cmi
-lib/ocaml/parsing.cmx
 lib/ocaml/parsing.ml
 lib/ocaml/parsing.mli
 lib/ocaml/pervasives.cmi
-lib/ocaml/pervasives.cmx
 lib/ocaml/pervasives.ml
 lib/ocaml/pervasives.mli
 lib/ocaml/printexc.cmi
-lib/ocaml/printexc.cmx
 lib/ocaml/printexc.ml
 lib/ocaml/printexc.mli
 lib/ocaml/printf.cmi
-lib/ocaml/printf.cmx
 lib/ocaml/printf.ml
 lib/ocaml/printf.mli
 lib/ocaml/profiling.cmi
 lib/ocaml/profiling.cmo
 lib/ocaml/queue.cmi
-lib/ocaml/queue.cmx
 lib/ocaml/queue.ml
 lib/ocaml/queue.mli
 lib/ocaml/random.cmi
-lib/ocaml/random.cmx
 lib/ocaml/random.ml
 lib/ocaml/random.mli
 lib/ocaml/ratio.cmi
-lib/ocaml/ratio.cmx
 lib/ocaml/ratio.mli
 lib/ocaml/scanf.cmi
-lib/ocaml/scanf.cmx
 lib/ocaml/scanf.ml
 lib/ocaml/scanf.mli
 lib/ocaml/scrapelabels
 lib/ocaml/set.cmi
-lib/ocaml/set.cmx
 lib/ocaml/set.ml
 lib/ocaml/set.mli
 lib/ocaml/sort.cmi
-lib/ocaml/sort.cmx
 lib/ocaml/sort.ml
 lib/ocaml/sort.mli
 lib/ocaml/stack.cmi
-lib/ocaml/stack.cmx
 lib/ocaml/stack.ml
 lib/ocaml/stack.mli
 lib/ocaml/stdLabels.cmi
-lib/ocaml/stdLabels.cmx
 lib/ocaml/stdLabels.ml
 lib/ocaml/stdLabels.mli
 lib/ocaml/std_exit.cmi
 lib/ocaml/std_exit.cmo
-lib/ocaml/std_exit.cmx
 lib/ocaml/std_exit.ml
-lib/ocaml/std_exit.o
-lib/ocaml/std_exit.p.cmx
-lib/ocaml/std_exit.p.o
-lib/ocaml/stdlib.a
 lib/ocaml/stdlib.cma
-lib/ocaml/stdlib.cmxa
-lib/ocaml/stdlib.p.a
-lib/ocaml/stdlib.p.cmxa
-lib/ocaml/str.a
 lib/ocaml/str.cma
 lib/ocaml/str.cmi
-lib/ocaml/str.cmx
-lib/ocaml/str.cmxa
 lib/ocaml/str.mli
 lib/ocaml/stream.cmi
-lib/ocaml/stream.cmx
 lib/ocaml/stream.ml
 lib/ocaml/stream.mli
 lib/ocaml/string.cmi
-lib/ocaml/string.cmx
 lib/ocaml/string.ml
 lib/ocaml/string.mli
 lib/ocaml/stringLabels.cmi
-lib/ocaml/stringLabels.cmx
 lib/ocaml/stringLabels.ml
 lib/ocaml/stringLabels.mli
-lib/ocaml/string_misc.cmx
 lib/ocaml/sys.cmi
-lib/ocaml/sys.cmx
 lib/ocaml/sys.ml
 lib/ocaml/sys.mli
 lib/ocaml/thread.mli
@@ -742,35 +559,25 @@
 lib/ocaml/toploop.cmi
 lib/ocaml/topmain.cmi
 lib/ocaml/topstart.cmo
-lib/ocaml/unix.a
 lib/ocaml/unix.cma
 lib/ocaml/unix.cmi
-lib/ocaml/unix.cmx
-lib/ocaml/unix.cmxa
 lib/ocaml/unix.mli
 lib/ocaml/unixLabels.cmi
-lib/ocaml/unixLabels.cmx
 lib/ocaml/unixLabels.mli
 lib/ocaml/weak.cmi
-lib/ocaml/weak.cmx
 lib/ocaml/weak.ml
 lib/ocaml/weak.mli
 man/man1/camlp4.1
 man/man1/camlp4o.1
-man/man1/camlp4o.opt.1
 man/man1/camlp4r.1
-man/man1/camlp4r.opt.1
 man/man1/mkcamlp4.1
 man/man1/ocaml.1
 man/man1/ocamlc.1
-man/man1/ocamlc.opt.1
 man/man1/ocamlcp.1
 man/man1/ocamldebug.1
 man/man1/ocamldep.1
 man/man1/ocamllex.1
 man/man1/ocamlmktop.1
-man/man1/ocamlopt.1
-man/man1/ocamlopt.opt.1
 man/man1/ocamlprof.1
 man/man1/ocamlrun.1
 man/man1/ocamlyacc.1