change -trans-mod to -no-alias-deps, and update message

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14738 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

10 files changed, 119 insertions, 323 deletions

diff --git a/boot/ocamlc b/boot/ocamlc
index 17d55f3c8..15b453288 100755
--- a/boot/ocamlc
+++ b/boot/ocamlc
diff --git a/driver/main.ml b/driver/main.ml
index 44df1208b..9a40e95a6 100644
--- a/driver/main.ml
+++ b/driver/main.ml
@@ -96,6 +96,7 @@ module Options = Main_args.Make_bytecomp_options (struct
   let _linkall = set link_everything
   let _make_runtime () =
     custom_runtime := true; make_runtime := true; link_everything := true
+  let _no_alias_deps = set transparent_modules
   let _no_app_funct = unset applicative_functors
   let _noassert = set noassert
   let _nolabels = set classic
@@ -113,7 +114,6 @@ module Options = Main_args.Make_bytecomp_options (struct
   let _short_paths = unset real_paths
   let _strict_sequence = set strict_sequence
   let _thread = set use_threads
-  let _trans_mod = set transparent_modules
   let _vmthread = set use_vmthreads
   let _unsafe = set fast
   let _unsafe_string = set unsafe_string
diff --git a/driver/main_args.ml b/driver/main_args.ml
index 1444ae457..6ebbdb0c1 100644
--- a/driver/main_args.ml
+++ b/driver/main_args.ml
@@ -150,6 +150,11 @@ let mk_modern f =
   "-modern", Arg.Unit f, " (deprecated) same as -labels"
 ;;
 
+let mk_no_alias_deps f =
+  "-no-alias-deps", Arg.Unit f,
+  " Do not record dependencies for module aliases"
+;;
+
 let mk_no_app_funct f =
   "-no-app-funct", Arg.Unit f, " Deactivate applicative functors"
 ;;
@@ -273,10 +278,6 @@ let mk_thread f =
   " Generate code that supports the system threads library"
 ;;
 
-let mk_trans_mod f =
-  "-trans-mod", Arg.Unit f,
-  " Make typing and linking only depend on normalized paths"
-
 let mk_unsafe f =
   "-unsafe", Arg.Unit f,
   " Do not compile bounds checking on array and string access"
@@ -446,228 +447,104 @@ let mk__ f =
   "<file>  Treat <file> as a file name (even if it starts with `-')"
 ;;
 
-module type Bytecomp_options = sig
-  val _a : unit -> unit
+module type Common_options = sig
   val _absname : unit -> unit
-  val _annot : unit -> unit
-  val _binannot : unit -> unit
-  val _c : unit -> unit
-  val _cc : string -> unit
-  val _cclib : string -> unit
-  val _ccopt : string -> unit
-  val _compat_32 : unit -> unit
-  val _config : unit -> unit
-  val _custom : unit -> unit
-  val _dllib : string -> unit
-  val _dllpath : string -> unit
-  val _g : unit -> unit
-  val _i : unit -> unit
   val _I : string -> unit
-  val _impl : string -> unit
-  val _intf : string -> unit
-  val _intf_suffix : string -> unit
-  val _keep_locs : unit -> unit
   val _labels : unit -> unit
-  val _linkall : unit -> unit
-  val _make_runtime : unit -> unit
+  val _no_alias_deps : unit -> unit
   val _no_app_funct : unit -> unit
   val _noassert : unit -> unit
-  val _noautolink : unit -> unit
   val _nolabels : unit -> unit
   val _nostdlib : unit -> unit
-  val _o : string -> unit
-  val _output_obj : unit -> unit
-  val _pack : unit -> unit
-  val _pp : string -> unit
   val _ppx : string -> unit
   val _principal : unit -> unit
   val _rectypes : unit -> unit
-  val _runtime_variant : string -> unit
   val _safe_string : unit -> unit
   val _short_paths : unit -> unit
   val _strict_sequence : unit -> unit
-  val _trans_mod : unit -> unit
-  val _thread : unit -> unit
-  val _vmthread : unit -> unit
   val _unsafe : unit -> unit
   val _unsafe_string : unit -> unit
-  val _use_runtime : string -> unit
-  val _v : unit -> unit
   val _version : unit -> unit
   val _vnum : unit -> unit
-  val _verbose : unit -> unit
   val _w : string -> unit
   val _warn_error : string -> unit
   val _warn_help : unit -> unit
-  val _where : unit -> unit
 
-  val _nopervasives : unit -> unit
-  val _use_prims : string -> unit
   val _dsource : unit -> unit
   val _dparsetree : unit -> unit
   val _dtypedtree : unit -> unit
   val _drawlambda : unit -> unit
   val _dlambda : unit -> unit
-  val _dinstr : unit -> unit
 
   val anonymous : string -> unit
 end;;
 
-module type Bytetop_options = sig
-  val _absname : unit -> unit
-  val _I : string -> unit
-  val _init : string -> unit
-  val _labels : unit -> unit
-  val _no_app_funct : unit -> unit
-  val _noassert : unit -> unit
-  val _noinit : unit -> unit
-  val _nolabels : unit -> unit
-  val _noprompt : unit -> unit
-  val _nopromptcont : unit -> unit
-  val _nostdlib : unit -> unit
-  val _ppx : string -> unit
-  val _principal : unit -> unit
-  val _rectypes : unit -> unit
-  val _safe_string : unit -> unit
-  val _short_paths : unit -> unit
-  val _stdin: unit -> unit
-  val _strict_sequence : unit -> unit
-  val _trans_mod : unit -> unit
-  val _unsafe : unit -> unit
-  val _unsafe_string : unit -> unit
-  val _version : unit -> unit
-  val _vnum : unit -> unit
-  val _w : string -> unit
-  val _warn_error : string -> unit
-  val _warn_help : unit -> unit
-
-  val _dsource : unit -> unit
-  val _dparsetree : unit -> unit
-  val _dtypedtree : unit -> unit
-  val _drawlambda : unit -> unit
-  val _dlambda : unit -> unit
-  val _dinstr : unit -> unit
-
-  val anonymous : string -> unit
-end;;
-
-module type Optcomp_options = sig
+module type Compiler_options =  sig
   val _a : unit -> unit
-  val _absname : unit -> unit
   val _annot : unit -> unit
   val _binannot : unit -> unit
   val _c : unit -> unit
   val _cc : string -> unit
   val _cclib : string -> unit
   val _ccopt : string -> unit
-  val _compact : unit -> unit
   val _config : unit -> unit
-  val _for_pack : string -> unit
   val _g : unit -> unit
   val _i : unit -> unit
-  val _I : string -> unit
   val _impl : string -> unit
-  val _inline : int -> unit
   val _intf : string -> unit
   val _intf_suffix : string -> unit
   val _keep_locs : unit -> unit
-  val _labels : unit -> unit
   val _linkall : unit -> unit
-  val _no_app_funct : unit -> unit
-  val _no_float_const_prop : unit -> unit
-  val _noassert : unit -> unit
   val _noautolink : unit -> unit
-  val _nodynlink : unit -> unit
-  val _nolabels : unit -> unit
-  val _nostdlib : unit -> unit
   val _o : string -> unit
   val _output_obj : unit -> unit
-  val _p : unit -> unit
   val _pack : unit -> unit
   val _pp : string -> unit
-  val _ppx : string -> unit
   val _principal : unit -> unit
   val _rectypes : unit -> unit
   val _runtime_variant : string -> unit
-  val _S : unit -> unit
   val _safe_string : unit -> unit
-  val _shared : unit -> unit
   val _short_paths : unit -> unit
-  val _strict_sequence : unit -> unit
-  val _trans_mod : unit -> unit
   val _thread : unit -> unit
-  val _unsafe : unit -> unit
-  val _unsafe_string : unit -> unit
   val _v : unit -> unit
   val _verbose : unit -> unit
-  val _version : unit -> unit
-  val _vnum : unit -> unit
-  val _w : string -> unit
-  val _warn_error : string -> unit
-  val _warn_help : unit -> unit
   val _where : unit -> unit
 
   val _nopervasives : unit -> unit
-  val _dsource : unit -> unit
-  val _dparsetree : unit -> unit
-  val _dtypedtree : unit -> unit
-  val _drawlambda : unit -> unit
-  val _dlambda : unit -> unit
-  val _dclambda : unit -> unit
-  val _dcmm : unit -> unit
-  val _dsel : unit -> unit
-  val _dcombine : unit -> unit
-  val _dcse : unit -> unit
-  val _dlive : unit -> unit
-  val _dspill : unit -> unit
-  val _dsplit : unit -> unit
-  val _dinterf : unit -> unit
-  val _dprefer : unit -> unit
-  val _dalloc : unit -> unit
-  val _dreload : unit -> unit
-  val _dscheduling :  unit -> unit
-  val _dlinear :  unit -> unit
-  val _dstartup :  unit -> unit
+end
+;;
 
-  val anonymous : string -> unit
+module type Bytecomp_options = sig
+  include Common_options
+  include Compiler_options
+  val _compat_32 : unit -> unit
+  val _custom : unit -> unit
+  val _dllib : string -> unit
+  val _dllpath : string -> unit
+  val _make_runtime : unit -> unit
+  val _vmthread : unit -> unit
+  val _use_runtime : string -> unit
+
+  val _dinstr : unit -> unit
+
+  val _use_prims : string -> unit
 end;;
 
-module type Opttop_options = sig
-  val _absname : unit -> unit
-  val _compact : unit -> unit
-  val _I : string -> unit
+module type Bytetop_options = sig
+  include Common_options
   val _init : string -> unit
-  val _inline : int -> unit
-  val _labels : unit -> unit
-  val _no_app_funct : unit -> unit
-  val _noassert : unit -> unit
   val _noinit : unit -> unit
-  val _nolabels : unit -> unit
   val _noprompt : unit -> unit
   val _nopromptcont : unit -> unit
-  val _nostdlib : unit -> unit
-  val _ppx : string -> unit
-  val _principal : unit -> unit
-  val _rectypes : unit -> unit
-  val _S : unit -> unit
-  val _safe_string : unit -> unit
-  val _short_paths : unit -> unit
   val _stdin : unit -> unit
-  val _strict_sequence : unit -> unit
-  val _trans_mod : unit -> unit
-  val _unsafe : unit -> unit
-  val _unsafe_string : unit -> unit
-  val _version : unit -> unit
-  val _vnum : unit -> unit
-  val _w : string -> unit
-  val _warn_error : string -> unit
-  val _warn_help : unit -> unit
 
-  val _dsource : unit -> unit
-  val _dparsetree : unit -> unit
-  val _dtypedtree : unit -> unit
-  val _drawlambda : unit -> unit
-  val _dlambda : unit -> unit
+  val _dinstr : unit -> unit
+end;;
+
+module type Optcommon_options = sig
+  val _compact : unit -> unit
+  val _inline : int -> unit
+
   val _dclambda : unit -> unit
   val _dcmm : unit -> unit
   val _dsel : unit -> unit
@@ -683,8 +560,30 @@ module type Opttop_options = sig
   val _dscheduling :  unit -> unit
   val _dlinear :  unit -> unit
   val _dstartup :  unit -> unit
+end;;
 
-  val anonymous : string -> unit
+module type Optcomp_options = sig
+  include Common_options
+  include Compiler_options
+  include Optcommon_options
+  val _for_pack : string -> unit
+  val _no_float_const_prop : unit -> unit
+  val _nodynlink : unit -> unit
+  val _p : unit -> unit
+  val _pp : string -> unit
+  val _S : unit -> unit
+  val _shared : unit -> unit
+end;;
+
+module type Opttop_options = sig
+  include Common_options
+  include Optcommon_options
+  val _init : string -> unit
+  val _noinit : unit -> unit
+  val _noprompt : unit -> unit
+  val _nopromptcont : unit -> unit
+  val _S : unit -> unit
+  val _stdin : unit -> unit
 end;;
 
 module type Arg_list = sig
@@ -722,6 +621,7 @@ struct
     mk_make_runtime F._make_runtime;
     mk_make_runtime_2 F._make_runtime;
     mk_modern F._labels;
+    mk_no_alias_deps F._no_alias_deps;
     mk_no_app_funct F._no_app_funct;
     mk_noassert F._noassert;
     mk_noautolink_byt F._noautolink;
@@ -738,7 +638,6 @@ struct
     mk_safe_string F._safe_string;
     mk_short_paths F._short_paths;
     mk_strict_sequence F._strict_sequence;
-    mk_trans_mod F._trans_mod;
     mk_thread F._thread;
     mk_unsafe F._unsafe;
     mk_unsafe_string F._unsafe_string;
@@ -773,6 +672,7 @@ struct
     mk_I F._I;
     mk_init F._init;
     mk_labels F._labels;
+    mk_no_alias_deps F._no_alias_deps;
     mk_no_app_funct F._no_app_funct;
     mk_noassert F._noassert;
     mk_noinit F._noinit;
@@ -787,7 +687,6 @@ struct
     mk_short_paths F._short_paths;
     mk_stdin F._stdin;
     mk_strict_sequence F._strict_sequence;
-    mk_trans_mod F._trans_mod;
     mk_unsafe F._unsafe;
     mk_unsafe_string F._unsafe_string;
     mk_version F._version;
@@ -831,6 +730,7 @@ struct
     mk_keep_locs F._keep_locs;
     mk_labels F._labels;
     mk_linkall F._linkall;
+    mk_no_alias_deps F._no_alias_deps;
     mk_no_app_funct F._no_app_funct;
     mk_no_float_const_prop F._no_float_const_prop;
     mk_noassert F._noassert;
@@ -852,7 +752,6 @@ struct
     mk_shared F._shared;
     mk_short_paths F._short_paths;
     mk_strict_sequence F._strict_sequence;
-    mk_trans_mod F._trans_mod;
     mk_thread F._thread;
     mk_unsafe F._unsafe;
     mk_unsafe_string F._unsafe_string;
@@ -898,6 +797,7 @@ module Make_opttop_options (F : Opttop_options) = struct
     mk_init F._init;
     mk_inline F._inline;
     mk_labels F._labels;
+    mk_no_alias_deps F._no_alias_deps;
     mk_no_app_funct F._no_app_funct;
     mk_noassert F._noassert;
     mk_noinit F._noinit;
@@ -913,7 +813,6 @@ module Make_opttop_options (F : Opttop_options) = struct
     mk_short_paths F._short_paths;
     mk_stdin F._stdin;
     mk_strict_sequence F._strict_sequence;
-    mk_trans_mod F._trans_mod;
     mk_unsafe F._unsafe;
     mk_unsafe_string F._unsafe_string;
     mk_version F._version;
diff --git a/driver/main_args.mli b/driver/main_args.mli
index 98d294f87..d66f551ca 100644
--- a/driver/main_args.mli
+++ b/driver/main_args.mli
@@ -10,95 +10,21 @@
 (*                                                                     *)
 (***********************************************************************)
 
-module type Bytecomp_options =
-  sig
-    val _a : unit -> unit
-    val _absname : unit -> unit
-    val _annot : unit -> unit
-    val _binannot : unit -> unit
-    val _c : unit -> unit
-    val _cc : string -> unit
-    val _cclib : string -> unit
-    val _ccopt : string -> unit
-    val _compat_32 : unit -> unit
-    val _config : unit -> unit
-    val _custom : unit -> unit
-    val _dllib : string -> unit
-    val _dllpath : string -> unit
-    val _g : unit -> unit
-    val _i : unit -> unit
-    val _I : string -> unit
-    val _impl : string -> unit
-    val _intf : string -> unit
-    val _intf_suffix : string -> unit
-    val _keep_locs : unit -> unit
-    val _labels : unit -> unit
-    val _linkall : unit -> unit
-    val _make_runtime : unit -> unit
-    val _no_app_funct : unit -> unit
-    val _noassert : unit -> unit
-    val _noautolink : unit -> unit
-    val _nolabels : unit -> unit
-    val _nostdlib : unit -> unit
-    val _o : string -> unit
-    val _output_obj : unit -> unit
-    val _pack : unit -> unit
-    val _pp : string -> unit
-    val _ppx : string -> unit
-    val _principal : unit -> unit
-    val _rectypes : unit -> unit
-    val _runtime_variant : string -> unit
-    val _safe_string : unit -> unit
-    val _short_paths : unit -> unit
-    val _strict_sequence : unit -> unit
-    val _trans_mod : unit -> unit
-    val _thread : unit -> unit
-    val _vmthread : unit -> unit
-    val _unsafe : unit -> unit
-    val _unsafe_string : unit -> unit
-    val _use_runtime : string -> unit
-    val _v : unit -> unit
-    val _version : unit -> unit
-    val _vnum : unit -> unit
-    val _verbose : unit -> unit
-    val _w : string -> unit
-    val _warn_error : string -> unit
-    val _warn_help : unit -> unit
-    val _where : unit -> unit
-
-    val _nopervasives : unit -> unit
-    val _use_prims : string -> unit
-    val _dsource : unit -> unit
-    val _dparsetree : unit -> unit
-    val _dtypedtree : unit -> unit
-    val _drawlambda : unit -> unit
-    val _dlambda : unit -> unit
-    val _dinstr : unit -> unit
-
-    val anonymous : string -> unit
-  end
-;;
-
-module type Bytetop_options = sig
+module type Common_options = sig
   val _absname : unit -> unit
   val _I : string -> unit
-  val _init : string -> unit
   val _labels : unit -> unit
+  val _no_alias_deps : unit -> unit
   val _no_app_funct : unit -> unit
   val _noassert : unit -> unit
-  val _noinit : unit -> unit
   val _nolabels : unit -> unit
-  val _noprompt : unit -> unit
-  val _nopromptcont : unit -> unit
   val _nostdlib : unit -> unit
   val _ppx : string -> unit
   val _principal : unit -> unit
   val _rectypes : unit -> unit
   val _safe_string : unit -> unit
   val _short_paths : unit -> unit
-  val _stdin : unit -> unit
   val _strict_sequence : unit -> unit
-  val _trans_mod : unit -> unit
   val _unsafe : unit -> unit
   val _unsafe_string : unit -> unit
   val _version : unit -> unit
@@ -112,128 +38,76 @@ module type Bytetop_options = sig
   val _dtypedtree : unit -> unit
   val _drawlambda : unit -> unit
   val _dlambda : unit -> unit
-  val _dinstr : unit -> unit
 
   val anonymous : string -> unit
-end;;
+end
 
-module type Optcomp_options = sig
+module type Compiler_options =  sig
   val _a : unit -> unit
-  val _absname : unit -> unit
   val _annot : unit -> unit
   val _binannot : unit -> unit
   val _c : unit -> unit
   val _cc : string -> unit
   val _cclib : string -> unit
   val _ccopt : string -> unit
-  val _compact : unit -> unit
   val _config : unit -> unit
-  val _for_pack : string -> unit
   val _g : unit -> unit
   val _i : unit -> unit
-  val _I : string -> unit
   val _impl : string -> unit
-  val _inline : int -> unit
   val _intf : string -> unit
   val _intf_suffix : string -> unit
   val _keep_locs : unit -> unit
-  val _labels : unit -> unit
   val _linkall : unit -> unit
-  val _no_app_funct : unit -> unit
-  val _no_float_const_prop : unit -> unit
-  val _noassert : unit -> unit
   val _noautolink : unit -> unit
-  val _nodynlink : unit -> unit
-  val _nolabels : unit -> unit
-  val _nostdlib : unit -> unit
   val _o : string -> unit
   val _output_obj : unit -> unit
-  val _p : unit -> unit
   val _pack : unit -> unit
   val _pp : string -> unit
-  val _ppx : string -> unit
   val _principal : unit -> unit
   val _rectypes : unit -> unit
   val _runtime_variant : string -> unit
-  val _S : unit -> unit
   val _safe_string : unit -> unit
-  val _shared : unit -> unit
   val _short_paths : unit -> unit
-  val _strict_sequence : unit -> unit
-  val _trans_mod : unit -> unit
   val _thread : unit -> unit
-  val _unsafe : unit -> unit
-  val _unsafe_string : unit -> unit
   val _v : unit -> unit
   val _verbose : unit -> unit
-  val _version : unit -> unit
-  val _vnum : unit -> unit
-  val _w : string -> unit
-  val _warn_error : string -> unit
-  val _warn_help : unit -> unit
   val _where : unit -> unit
 
   val _nopervasives : unit -> unit
-  val _dsource : unit -> unit
-  val _dparsetree : unit -> unit
-  val _dtypedtree : unit -> unit
-  val _drawlambda : unit -> unit
-  val _dlambda : unit -> unit
-  val _dclambda : unit -> unit
-  val _dcmm : unit -> unit
-  val _dsel : unit -> unit
-  val _dcombine : unit -> unit
-  val _dcse : unit -> unit
-  val _dlive : unit -> unit
-  val _dspill : unit -> unit
-  val _dsplit : unit -> unit
-  val _dinterf : unit -> unit
-  val _dprefer : unit -> unit
-  val _dalloc : unit -> unit
-  val _dreload : unit -> unit
-  val _dscheduling :  unit -> unit
-  val _dlinear :  unit -> unit
-  val _dstartup :  unit -> unit
+end
+;;
 
-  val anonymous : string -> unit
+module type Bytecomp_options = sig
+  include Common_options
+  include Compiler_options
+  val _compat_32 : unit -> unit
+  val _custom : unit -> unit
+  val _dllib : string -> unit
+  val _dllpath : string -> unit
+  val _make_runtime : unit -> unit
+  val _vmthread : unit -> unit
+  val _use_runtime : string -> unit
+
+  val _dinstr : unit -> unit
+
+  val _use_prims : string -> unit
 end;;
 
-module type Opttop_options = sig
-  val _absname : unit -> unit
-  val _compact : unit -> unit
-  val _I : string -> unit
+module type Bytetop_options = sig
+  include Common_options
   val _init : string -> unit
-  val _inline : int -> unit
-  val _labels : unit -> unit
-  val _no_app_funct : unit -> unit
-  val _noassert : unit -> unit
   val _noinit : unit -> unit
-  val _nolabels : unit -> unit
   val _noprompt : unit -> unit
   val _nopromptcont : unit -> unit
-  val _nostdlib : unit -> unit
-  val _ppx : string -> unit
-  val _principal : unit -> unit
-  val _rectypes : unit -> unit
-  val _S : unit -> unit
-  val _safe_string : unit -> unit
-  val _short_paths : unit -> unit
   val _stdin : unit -> unit
-  val _strict_sequence : unit -> unit
-  val _trans_mod : unit -> unit
-  val _unsafe : unit -> unit
-  val _unsafe_string : unit -> unit
-  val _version : unit -> unit
-  val _vnum : unit -> unit
-  val _w : string -> unit
-  val _warn_error : string -> unit
-  val _warn_help : unit -> unit
 
-  val _dsource : unit -> unit
-  val _dparsetree : unit -> unit
-  val _dtypedtree : unit -> unit
-  val _drawlambda : unit -> unit
-  val _dlambda : unit -> unit
+  val _dinstr : unit -> unit
+end;;
+
+module type Optcommon_options = sig
+  val _compact : unit -> unit
+  val _inline : int -> unit
+
   val _dclambda : unit -> unit
   val _dcmm : unit -> unit
   val _dsel : unit -> unit
@@ -249,8 +123,30 @@ module type Opttop_options = sig
   val _dscheduling :  unit -> unit
   val _dlinear :  unit -> unit
   val _dstartup :  unit -> unit
+end;;
 
-  val anonymous : string -> unit
+module type Optcomp_options = sig
+  include Common_options
+  include Compiler_options
+  include Optcommon_options
+  val _for_pack : string -> unit
+  val _no_float_const_prop : unit -> unit
+  val _nodynlink : unit -> unit
+  val _p : unit -> unit
+  val _pp : string -> unit
+  val _S : unit -> unit
+  val _shared : unit -> unit
+end;;
+
+module type Opttop_options = sig
+  include Common_options
+  include Optcommon_options
+  val _init : string -> unit
+  val _noinit : unit -> unit
+  val _noprompt : unit -> unit
+  val _nopromptcont : unit -> unit
+  val _S : unit -> unit
+  val _stdin : unit -> unit
 end;;
 
 module type Arg_list = sig
diff --git a/driver/optmain.ml b/driver/optmain.ml
index 8285c6deb..21c1f8e12 100644
--- a/driver/optmain.ml
+++ b/driver/optmain.ml
@@ -93,6 +93,7 @@ module Options = Main_args.Make_optcomp_options (struct
   let _keep_locs = set keep_locs
   let _labels = clear classic
   let _linkall = set link_everything
+  let _no_alias_deps = set transparent_modules
   let _no_app_funct = clear applicative_functors
   let _no_float_const_prop = clear float_const_prop
   let _noassert = set noassert
@@ -112,7 +113,6 @@ module Options = Main_args.Make_optcomp_options (struct
   let _safe_string = clear unsafe_string
   let _short_paths = clear real_paths
   let _strict_sequence = set strict_sequence
-  let _trans_mod = set transparent_modules
   let _shared () = shared := true; dlcode := true
   let _S = set keep_asm_file
   let _thread = set use_threads
diff --git a/stdlib/Compflags b/stdlib/Compflags
index d0938af89..9610b726c 100755
--- a/stdlib/Compflags
+++ b/stdlib/Compflags
@@ -20,6 +20,6 @@ case $1 in
                            # make sure add_char is inlined (PR#5872)
   buffer.cm[io]|printf.cm[io]|format.cm[io]|scanf.cm[io]) echo ' -w A';;
   scanf.cmx|scanf.p.cmx) echo ' -inline 9';;
-  *Labels.cm[ox]|*Labels.p.cmx) echo ' -nolabels -trans-mod';;
+  *Labels.cm[ox]|*Labels.p.cmx) echo ' -nolabels -no-alias-deps';;
   *) echo ' ';;
 esac
diff --git a/tools/ocamlcp.ml b/tools/ocamlcp.ml
index 1bc78ee87..fc148a4f2 100644
--- a/tools/ocamlcp.ml
+++ b/tools/ocamlcp.ml
@@ -64,6 +64,7 @@ module Options = Main_args.Make_bytecomp_options (struct
   let _labels = option "-labels"
   let _linkall = option "-linkall"
   let _make_runtime = option "-make-runtime"
+  let _no_alias_deps = option "-no-alias-deps"
   let _no_app_funct = option "-no-app-funct"
   let _noassert = option "-noassert"
   let _nolabels = option "-nolabels"
@@ -80,7 +81,6 @@ module Options = Main_args.Make_bytecomp_options (struct
   let _safe_string = option "-safe-string"
   let _short_paths = option "-short-paths"
   let _strict_sequence = option "-strict-sequence"
-  let _trans_mod = option "-trans-mod"
   let _thread () = option "-thread" ()
   let _vmthread () = option "-vmthread" ()
   let _unsafe = option "-unsafe"
diff --git a/tools/ocamloptp.ml b/tools/ocamloptp.ml
index dc0aec9bb..b530fa3c8 100644
--- a/tools/ocamloptp.ml
+++ b/tools/ocamloptp.ml
@@ -64,6 +64,7 @@ module Options = Main_args.Make_optcomp_options (struct
   let _keep_locs = option "-keep-locs"
   let _labels = option "-labels"
   let _linkall = option "-linkall"
+  let _no_alias_deps = option "-no-alias-deps"
   let _no_app_funct = option "-no-app-funct"
   let _no_float_const_prop = option "-no-float-const-prop"
   let _noassert = option "-noassert"
@@ -86,7 +87,6 @@ module Options = Main_args.Make_optcomp_options (struct
   let _strict_sequence = option "-strict-sequence"
   let _shared = option "-shared"
   let _thread = option "-thread"
-  let _trans_mod = option "-trans-mod"
   let _unsafe = option "-unsafe"
   let _unsafe_string = option "-unsafe-string"
   let _v = option "-v"
diff --git a/toplevel/opttopmain.ml b/toplevel/opttopmain.ml
index 3e15c1988..941c3ec26 100644
--- a/toplevel/opttopmain.ml
+++ b/toplevel/opttopmain.ml
@@ -69,6 +69,7 @@ module Options = Main_args.Make_opttop_options (struct
   let _init s = init_file := Some s
   let _inline n = inline_threshold := n * 8
   let _labels = clear classic
+  let _no_alias_deps = set transparent_modules
   let _no_app_funct = clear applicative_functors
   let _noassert = set noassert
   let _nolabels = set classic
diff --git a/toplevel/topmain.ml b/toplevel/topmain.ml
index 207d749a5..bcaa0734e 100644
--- a/toplevel/topmain.ml
+++ b/toplevel/topmain.ml
@@ -67,6 +67,7 @@ module Options = Main_args.Make_bytetop_options (struct
   let _init s = init_file := Some s
   let _noinit = set noinit
   let _labels = clear classic
+  let _no_alias_deps = set transparent_modules
   let _no_app_funct = clear applicative_functors
   let _noassert = set noassert
   let _nolabels = set classic
@@ -80,7 +81,6 @@ module Options = Main_args.Make_bytetop_options (struct
   let _short_paths = clear real_paths
   let _stdin () = file_argument ""
   let _strict_sequence = set strict_sequence
-  let _trans_mod = set transparent_modules
   let _unsafe = set fast
   let _unsafe_string = set unsafe_string
   let _version () = print_version ()