From c58233b2820e6341a8077cf4bf6e3e5b15d1cbf5 Mon Sep 17 00:00:00 2001
From: xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>
Date: Tue, 19 Aug 2014 13:47:39 +0000
Subject: Rename "-fthumb" option into "-mthumb" for GCC compatibility.

git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2572 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
---
 driver/Clflags.ml |  2 +-
 driver/Driver.ml  | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'driver')

diff --git a/driver/Clflags.ml b/driver/Clflags.ml
index d3d4067..76c9892 100644
--- a/driver/Clflags.ml
+++ b/driver/Clflags.ml
@@ -28,7 +28,7 @@ let option_falignfunctions = ref (None: int option)
 let option_falignbranchtargets = ref 0
 let option_faligncondbranchs = ref 0
 let option_finline_asm = ref false
-let option_fthumb = ref (Configuration.model = "armv7m")
+let option_mthumb = ref (Configuration.model = "armv7m")
 let option_Osize = ref false
 let option_dparse = ref false
 let option_dcmedium = ref false
diff --git a/driver/Driver.ml b/driver/Driver.ml
index da2fa7c..ae39783 100644
--- a/driver/Driver.ml
+++ b/driver/Driver.ml
@@ -426,11 +426,12 @@ Language support options (use -fno-<opt> to turn off -f<opt>) :
   -finline-asm   Support inline 'asm' statements [off]
   -fall          Activate all language support options above
   -fnone         Turn off all language support options above
+Debugging options:
+  -g             Generate debugging information
 Code generation options: (use -fno-<opt> to turn off -f<opt>) :
   -O             Optimize for speed [on by default]
   -Os            Optimize for code size
   -ffpu          Use FP registers for some integer operations [on]
-  -fthumb        (ARM only) Use Thumb2 instruction encoding
   -fsmall-data <n>  Set maximal size <n> for allocation in small data area
   -fsmall-const <n>  Set maximal size <n> for allocation in small constant area
   -ffloat-const-prop <n>  Control constant propagation of floats
@@ -439,9 +440,11 @@ Code generation options: (use -fno-<opt> to turn off -f<opt>) :
   -falign-functions <n>  Set alignment (in bytes) of function entry points
   -falign-branch-targets <n>  Set alignment (in bytes) of branch targets
   -falign-cond-branches <n>  Set alignment (in bytes) of conditional branches
+Target processor options:
+  -mthumb        (ARM only) Use Thumb2 instruction encoding
+  -marm          (ARM only) Use classic ARM instruction encoding
+Assembling options:
   -Wa,<opt>      Pass option <opt> to the assembler
-Debugging options:
-  -g             Generate debugging information
 Linking options:
   -l<lib>        Link library <lib>
   -L<dir>        Add <dir> to search path for libraries
@@ -533,6 +536,8 @@ let cmdline_actions =
   "-Os$", Set option_Osize;
   "-O$", Unset option_Osize;
   "-timings$", Set option_timings;
+  "-mthumb$", Set option_mthumb;
+  "-marm$", Unset option_mthumb;
   "-fsmall-data$", Integer(fun n -> option_small_data := n);
   "-fsmall-const$", Integer(fun n -> option_small_const := n);
   "-ffloat-const-prop$", Integer(fun n -> option_ffloatconstprop := n);
@@ -554,7 +559,6 @@ let cmdline_actions =
   @ f_opt "inline-asm" option_finline_asm
   @ f_opt "fpu" option_ffpu
   @ f_opt "sse" option_ffpu (* backward compatibility *)
-  @ f_opt "thumb" option_fthumb
 
 let _ =
   try
-- 
cgit v1.2.3