Browse Source

- remove switch -Wx for arm thumb interworking, one should use -CTHUMBTINTERWORKING=ON instead

git-svn-id: trunk@23572 -
florian 12 years ago
parent
commit
3ca7a5ff8e

+ 2 - 0
compiler/globtype.pas

@@ -277,7 +277,9 @@ interface
 
        ttargetswitchinfo = record
           name: string[22];
+          { target switch can have an arbitratry value, not only on/off }
           hasvalue: boolean;
+          { target switch can be used only globally }
           isglobal: boolean;
        end;
 

+ 0 - 1
compiler/msg/errord.msg

@@ -3646,7 +3646,6 @@ A*2WP<x>_Minimale iOS Deployment Version: 3.0, 5.0.1, ... (Darwin)
 A*2WR_Erzeuge "relocation code" (Windows)
 P*2WF_Spezifiziere "MPW tool type application" (Classic Mac OS)
 **2WX_Erm”gliche den executable stack (Linux)
-A*2Wx_Erzeuge "thumb interworking safe code", wenn m”glich
 **1X_Programm-Optionen:
 **2Xc_šbergebe --shared an den Linker (nur Unix)
 **2Xd_Den Standard Bibliotheks-Suchpfad NICHT nutzen (ben”tigt fr cross compile, wenn nicht -XR verwendet wird)

+ 0 - 1
compiler/msg/errordu.msg

@@ -3647,7 +3647,6 @@ A*2WP<x>_Minimale iOS Deployment Version: 3.0, 5.0.1, ... (Darwin)
 A*2WR_Erzeuge "relocation code" (Windows)
 P*2WF_Spezifiziere "MPW tool type application" (Classic Mac OS)
 **2WX_Ermögliche den executable stack (Linux)
-A*2Wx_Erzeuge "thumb interworking safe code", wenn möglich
 **1X_Programm-Optionen:
 **2Xc_Übergebe --shared an den Linker (nur Unix)
 **2Xd_Den Standard Bibliotheks-Suchpfad NICHT nutzen (benötigt für cross compile, wenn nicht -XR verwendet wird)

+ 0 - 1
compiler/msg/errore.msg

@@ -3629,7 +3629,6 @@ A*2WP<x>_Minimum iOS deployment version: 3.0, 5.0.1, ... (Darwin)
 A*2WR_Generate relocation code (Windows)
 P*2WT_Specify MPW tool type application (Classic Mac OS)
 **2WX_Enable executable stack (Linux)
-A*2Wx_Generate thumb interworking safe code if possible
 **1X_Executable options:
 **2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Linux)
 **2Xd_Do not search default library path (sometimes required for cross-compiling when not using -XR)

+ 1 - 1
compiler/msgidx.inc

@@ -968,7 +968,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 68525;
+  MsgTxtSize = 68469;
 
   MsgIdxMax : array[1..20] of longint=(
     26,93,332,120,87,56,126,27,202,63,

+ 11 - 12
compiler/msgtxt.inc

@@ -1548,30 +1548,29 @@ const msgtxt : array[0..000285,1..240] of char=(
   'A*2WR_Genera','te relocation code (Windows)'#010+
   'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
   '**2WX_Enable executable stack (Linux)'#010+
-  'A*2Wx_Generate thumb interworking safe code if possible'#010+
   '**1X_Executable options:'#010+
-  '**2Xc_Pass --shared/-dynamic to the',' linker (BeOS, Darwin, FreeBSD, L'+
-  'inux)'#010+
-  '**2Xd_Do not search default library path (sometimes required for cross'+
-  '-compiling when not using -XR)'#010+
+  '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
+  'ux)'#010+
+  '**2Xd_Do not sear','ch default library path (sometimes required for cro'+
+  'ss-compiling when not using -XR)'#010+
   '**2Xe_Use external linker'#010+
   '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
-  'to e','xecutable'#010+
-  '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
+  'to executable'#010+
+  '**2XD_Try to link units dynamically      (defi','nes FPC_LINK_DYNAMIC)'#010+
   '**2Xi_Use internal linker'#010+
   '**2Xm_Generate link map'#010+
   '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
   's '#039'main'#039')'#010+
-  'F*2Xp<x>_First search for the compiler b','inary in the directory <x>'#010+
-  '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
+  'F*2Xp<x>_First search for the compiler binary in the directory <x>'#010+
+  '**2XP<x>_Prepend the binutils',' names with the prefix <x>'#010+
   '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
   'ile, see the ld manual for more information) (BeOS, Linux)'#010+
-  '**2XR<x>_Prepend <x> to all link','er search paths (BeOS, Darwin, FreeB'+
-  'SD, Linux, Mac OS, Solaris)'#010+
+  '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
+  ', Linux, Mac OS, S','olaris)'#010+
   '**2Xs_Strip all symbols from executable'#010+
   '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
   '**2Xt_Link with static libraries (-static is passed to linker)'#010+
-  '**2','XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
+  '**2XX_Try to smartlink units             (defines FPC_LINK_','SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+
   '**1h_Shows this help without waiting'

+ 0 - 12
compiler/options.pas

@@ -1918,18 +1918,6 @@ begin
                         else
                           IllegalPara(opt);
                       end;
-                    'x':
-                      begin
-                        if target_info.cpu=systems.cpu_arm then
-                          begin
-                            if UnsetBool(More, j, opt, false) then
-                              exclude(init_settings.targetswitches,ts_thumb_interworking)
-                            else
-                              include(init_settings.targetswitches,ts_thumb_interworking);
-                          end
-                        else
-                          IllegalPara(opt);
-                      end;
                     else
                       IllegalPara(opt);
                   end;