[m-rev.] diff: delete --fullarch

Julien Fischer jfischer at opturion.com
Thu Sep 7 11:38:58 AEST 2023


Delete --fullarch.

The internal option --fullarch has been deprecated in favour of --target-arch
since 2014. Delete it and replace any uses with --target-arch.

compiler/options.m:
     As above.

scripts/Mercury.config.in:
scripts/Mercury.config.boostrap.in:
extras/windows_installer_generator/sample/Mercury.config:
     Conform to the above change.

Julien.

diff --git a/compiler/options.m b/compiler/options.m
index 398532a..264e919 100644
--- a/compiler/options.m
+++ b/compiler/options.m
@@ -3144,7 +3144,6 @@ long_option("typecheck-ambiguity-error-limit",
  long_option("help",                 help).
  long_option("version",              version).
  long_option("filenames-from-stdin", filenames_from_stdin).
-long_option("fullarch",             target_arch).
  long_option("target-arch",          target_arch).
  long_option("cross-compiling",      cross_compiling).
  long_option("local-module-id",      local_module_id).
@@ -6799,9 +6798,8 @@ options_help_misc(Stream, !IO) :-
          "--version",
          "\tDisplay the compiler version.",

-        % The `--target-arch' options is reserved for use by the
-        % `Mercury.config' file. The `--fullarch' option is a deprecated
-        % synonym for this.
+        % The `--target-arch' option is reserved for use by the
+        % `Mercury.config' file.

  % This option has no effect now.
  %       "--cross-compiling",
diff --git a/extras/windows_installer_generator/sample/Mercury.config b/extras/windows_installer_generator/sample/Mercury.config
index 5748160..8e9f95e 100644
--- a/extras/windows_installer_generator/sample/Mercury.config
+++ b/extras/windows_installer_generator/sample/Mercury.config
@@ -97,7 +97,7 @@ DEFAULT_MCFLAGS=\
  		--shlib-linker-install-name-flag "-install_name " \
  		--linker-allow-undefined-flag "" \
  		--linker-error-undefined-flag "" \
-		--fullarch "i686-pc-mingw32" \
+		--target-arch "i686-pc-mingw32" \
  		--install-prefix "@INSTALL_PREFIX@" \
  		--num-real-r-regs "1" \
  		--num-real-r-temps "0" \
diff --git a/scripts/Mercury.config.bootstrap.in b/scripts/Mercury.config.bootstrap.in
index e01eb26..f04ab64 100644
--- a/scripts/Mercury.config.bootstrap.in
+++ b/scripts/Mercury.config.bootstrap.in
@@ -113,7 +113,7 @@ DEFAULT_MCFLAGS=\
  		--shlib-linker-install-name-flag "@SHLIB_INSTALL_NAME_FLAG@" \
  		--linker-allow-undefined-flag "@ALLOW_UNDEFINED@" \
  		--linker-error-undefined-flag "@ERROR_UNDEFINED@" \
-		--fullarch "$(MERCURY_TARGET_ARCH)" \
+		--target-arch "$(MERCURY_TARGET_ARCH)" \
  		--install-prefix "@prefix@" \
  		--num-real-r-regs "@NUM_REAL_R_REGS@" \
  		--num-real-r-temps "@NUM_REAL_R_TEMPS@" \
diff --git a/scripts/Mercury.config.in b/scripts/Mercury.config.in
index 1ec5704..004e0cd 100644
--- a/scripts/Mercury.config.in
+++ b/scripts/Mercury.config.in
@@ -115,7 +115,7 @@ DEFAULT_MCFLAGS=\
  		--shlib-linker-install-name-flag "@SHLIB_INSTALL_NAME_FLAG@" \
  		--linker-allow-undefined-flag "@ALLOW_UNDEFINED@" \
  		--linker-error-undefined-flag "@ERROR_UNDEFINED@" \
-		--fullarch "$(MERCURY_TARGET_ARCH)" \
+		--target-arch "$(MERCURY_TARGET_ARCH)" \
  		--install-prefix "@PREFIX@" \
  		--num-real-r-regs "@NUM_REAL_R_REGS@" \
  		--num-real-r-temps "@NUM_REAL_R_TEMPS@" \




More information about the reviews mailing list