Merge pull request #6 in PROC_LIBS/fftlib from CATREQ-2702 to masterHEADmaster

* commit 'bfc27b402e3197ecc268629bdc7d8ad1e4bf9116':
  CATREQ-2702: Descoping big endian c6x

3 files changed, 9 insertions, 240 deletions

diff --git a/ti/mas/swtools/CommonBld.xs b/ti/mas/swtools/CommonBld.xs
index 31bd886..c0a8174 100644
--- a/ti/mas/swtools/CommonBld.xs
+++ b/ti/mas/swtools/CommonBld.xs
@@ -173,7 +173,7 @@ function parseArgs(arguments)
   /* Check if the package is target independent */
   if(targets==undefined)
   {  
-     targets = [C54, C54_far, C55, C55_large, C674, C674_big_endian, C674_elf, C674_big_endian_elf, C64P, C66, C66_big_endian, C64P_elf, C66_elf, C66_big_endian_elf, K2H, K2H_big_endian, K2H_elf, K2H_big_endian_elf, MVArm9, GCArmv6, GCArmv7A, WinCE, VC98, TIArmv6le, TIArmv6be];
+     targets = [C54, C54_far, C55, C55_large, C674, C674_elf, C64P, C66, C64P_elf, C66_elf, MVArm9, GCArmv6, GCArmv7A, WinCE, VC98, TIArmv6le, TIArmv6be];
      /* Target Independent */
      targ_indp=true;
   }
@@ -254,18 +254,10 @@ function parseArgs(arguments)
       var xtargs = [C674];
       xdcargs_targ=arguments[k];         
       break;
-    case "c674be":
-      var xtargs = [C674_big_endian];
-      xdcargs_targ=arguments[k];         
-      break;    
     case "c674le_elf":
       var xtargs = [C674_elf];
       xdcargs_targ=arguments[k];         
       break;
-    case "c674be_elf":
-      var xtargs = [C674_big_endian_elf];
-      xdcargs_targ=arguments[k];         
-      break; 
    case "c674x":
       var xtargs = [C674, C674_elf];
       ext="c674x";
@@ -276,35 +268,27 @@ function parseArgs(arguments)
       var xtargs = [C66];
       xdcargs_targ=arguments[k];         
       break;
-    case "c66be":
-      var xtargs = [C66_big_endian];
-      xdcargs_targ=arguments[k];         
-      break;    
     case "c66le_elf":
       var xtargs = [C66_elf];
       xdcargs_targ=arguments[k];         
       break;
-    case "c66be_elf":
-      var xtargs = [C66_big_endian_elf];
-      xdcargs_targ=arguments[k];         
-      break;      
     case "c66x":
-      var xtargs = [C66, C66_big_endian, C66_elf,C66_big_endian_elf];
+      var xtargs = [C66_elf];
       ext="c66x";
       xdcargs_targ=arguments[k];
       break; 
     case "c66x_coff":
-      var xtargs = [C66, C66_big_endian];
+      var xtargs = [C66];
       ext="c66x_coff";
       xdcargs_targ=arguments[k];
       break; 
     case "c66x_elf":
-      var xtargs = [C66_elf,C66_big_endian_elf];
+      var xtargs = [C66_elf];
       ext="c66x_elf";
       xdcargs_targ=arguments[k];
       break;
     case "k2hx":
-      var xtargs = [K2H, K2H_elf, K2H_big_endian, K2H_big_endian_elf];
+      var xtargs = [K2H, K2H_elf];
       ext="k2hx";
       xdcargs_targ=arguments[k];
       break;
@@ -318,16 +302,6 @@ function parseArgs(arguments)
       ext="K2H_elf";
       xdcargs_targ=arguments[k];
       break;   
-    case "K2H_big_endian":
-      var xtargs = [K2H_big_endian];
-      ext="K2H_big_endian";
-      xdcargs_targ=arguments[k];
-      break;   
-    case "K2H_big_endian_elf":
-      var xtargs = [K2H_big_endian_elf];
-      ext="K2H_big_endian_elf";
-      xdcargs_targ=arguments[k];
-      break;         
     case "c55l":
       var xtargs = [C55_large];
       xdcargs_targ=arguments[k];         
@@ -2264,10 +2238,9 @@ function archiveHeaders(dirs,recurse)
                 var targParams=getTargParams(targs[k]);
                 if(list[i]==targParams.targDirectory ||(list[i] == "c64P" && 
                    (targs[k]==C64P || targs[k]==C64P_elf)) || ((list[i] == "c674" || list[i] == "c64P" ) && 
-                   (targs[k]==C674 ||targs[k]==C674_big_endian || targs[k]==C674_elf ||targs[k]==C674_big_endian_elf)) 
-                   ||(list[i] == "c66" && (targs[k]==C66 ||targs[k]==C66_big_endian || targs[k]==C66_elf ||targs[k]==C66_big_endian_elf)) 
-                   || (list[i] == "K2H" && (targs[k]==K2H ||targs[k]==K2H_big_endian || targs[k]==K2H_elf ||targs[k]==K2H_big_endian_elf))
-                   || list[i] == "AM57")
+                   (targs[k]==C674 || targs[k]==C674_elf)) 
+                   ||(list[i] == "c66" && (targs[k]==C66 || targs[k]==C66_elf )) 
+                   || (list[i] == "K2H" && (targs[k]==K2H || targs[k]==K2H_elf )))
                   archiveHeaders(dirs+"/"+list[i],true); 
              
             }
@@ -2320,8 +2293,6 @@ function packageClean()
   Pkg.makeEpilogue += "clean::\n\t-$(RMDIR) c66e\n";
   Pkg.makeEpilogue += "clean::\n\t-$(RMDIR) K2H\n";
   Pkg.makeEpilogue += "clean::\n\t-$(RMDIR) K2He\n";
-  Pkg.makeEpilogue += "clean::\n\t-$(RMDIR) K2Hb\n";
-  Pkg.makeEpilogue += "clean::\n\t-$(RMDIR) K2Hbe\n";
   Pkg.makeEpilogue += "clean::\n\t-$(RMDIR) c64P\n";
   Pkg.makeEpilogue += "clean::\n\t-$(RMDIR) c64Pe\n";
   Pkg.makeEpilogue += "clean::\n\t-$(RMDIR) ce64P\n";
@@ -2376,31 +2347,16 @@ function printUsage(print_buffer)
       targetOption="c674le";
       targetDir="c674";
       break;
-    case C674_big_endian:
-      print_buffer.options +="      c674be       - Compile " + name + " for c674 coff target (big-endian)\n"; 
-      targetOption="c674be";
-      targetDir="c674e";
-      break;
     case C674_elf:
       print_buffer.options +="      c674le_elf       - Compile " + name + " for c674 elf target (little-endian)\n"; 
       targetOption="c674le";
       targetDir="c674";
       break;
-    case C674_big_endian:
-      print_buffer.options +="      c674be_elf       - Compile " + name + " for c674 elf target (big-endian)\n"; 
-      targetOption="c674be";
-      targetDir="c674e";
-      break;
     case C66:
       print_buffer.options +="      c66le       - Compile " + name + " for c66 target (little-endian)\n"; 
       targetOption="c66le";
       targetDir="ce66";
       break;
-    case C66_big_endian:
-      print_buffer.options +="      c66be       - Compile " + name + " for c66 target (big-endian)\n"; 
-      targetOption="c66be";
-      targetDir="ce66e";
-      break;
     case K2H:
       print_buffer.options +="      K2H       - Compile " + name + " for k2h target (little-endian)\n"; 
       targetOption="K2H";
@@ -4191,15 +4147,6 @@ function createbuildccspjts(action, ccsversion,pjtKind)
            var rtsc_target = "ti_targets_C66";             
            break;   
    
-           case C66_big_endian:
-           var endianness = "big";      
-           var device = "com.ti.ccstudio.deviceModel.C6000.CustomC6000Device";
-           var outputFormat = "coff";   
-           var cflags = "-mv6600 -k -mw -Dti_targets_C66_big_endian";     
-           var suffix = "BE_COFF";                                    
-           var rtsc_target = "ti_targets_C66_big_endian";                                  
-           break;   
-   
            case C66_elf:
            var endianness = "little";      
            var device = "com.ti.ccstudio.deviceModel.C6000.CustomC6000Device";   
@@ -4209,15 +4156,6 @@ function createbuildccspjts(action, ccsversion,pjtKind)
            var rtsc_target = "ti_targets_elf_C66";                                 
            break;   
    
-           case C66_big_endian_elf:
-           var endianness = "big";      
-           var device = "com.ti.ccstudio.deviceModel.C6000.CustomC6000Device";
-           var outputFormat = "elf";   
-           var cflags = "-mv6600 -k  -mw -Dti_targets_elf_C66_big_endian";     
-           var suffix = "BE_ELF";                              
-           var rtsc_target = "ti_targets_elf_C66_big_endian";                              
-           break;
-
            case K2H:
            var endianness = "little";      
            var device = "com.ti.ccstudio.deviceModel.C6000.CustomC6000Device";   
@@ -4245,23 +4183,6 @@ function createbuildccspjts(action, ccsversion,pjtKind)
            var rtsc_target = "ti_targets_elf_C66";                 
            break;    
            
-           case K2H_big_endian:
-           var endianness = "big";      
-           var device = "com.ti.ccstudio.deviceModel.C6000.CustomC6000Device";   
-           var outputFormat = "boff";   
-           var cflags = "-mv6600 -k -mw -DDEVICE_K2H";  
-           var suffix = "BE_COFF";   
-           var rtsc_target = "ti_targets_C66_big_endian";                  
-           break;    
-           case K2H_big_endian_elf:
-           var endianness = "big";      
-           var device = "com.ti.ccstudio.deviceModel.C6000.CustomC6000Device";   
-           var outputFormat = "elf";   
-           var cflags = "-mv6600 -k -mw -DDEVICE_K2H";  
-           var suffix = "BE_ELF";   
-           var rtsc_target = "ti_targets_elf_C66_big_endian";              
-           break;               
-
            default:
            continue;
  
diff --git a/ti/mas/swtools/config.bld b/ti/mas/swtools/config.bld
index 9f877bd..7fa1cce 100644
--- a/ti/mas/swtools/config.bld
+++ b/ti/mas/swtools/config.bld
@@ -122,18 +122,6 @@
   C674.cc.cmd = "cl6x -c";
   listTargs.push(C674);
 
- /* Set path to the c64 big endian tools directory */
-  var C674_big_endian             = xdc.useModule('ti.targets.C674_big_endian');
-  C674_big_endian.rootDir       = c674ToolsDir;
-  C674_big_endian.extensions[".s"] = {suf: ".s", typ: "asm"};
-  C674_big_endian.extensions[".sa"] = {suf: ".sa", typ: "asm:-fl"};
-  C674_big_endian.ccOpts.prefix = "";
-  C674_big_endian.profiles["release"].compileOpts.copts = "";
-  C674_big_endian.$unseal("cc");
-  C674_big_endian.cc.$unseal("cmd");
-  C674_big_endian.cc.cmd = "cl6x -c";
-  listTargs.push(C674_big_endian);
-
   var C674_elf             = xdc.useModule('ti.targets.elf.C674');
   C674_elf.rootDir       = c674ToolsDir;
   C674_elf.extensions[".s"] = {suf: ".s", typ: "asm"};
@@ -145,31 +133,17 @@
   C674_elf.cc.cmd = "cl6x -c";
   listTargs.push(C674_elf);
 
- /* Set path to the c64 big endian tools directory */
-  var C674_big_endian_elf             = xdc.useModule('ti.targets.elf.C674_big_endian');
-  C674_big_endian_elf.rootDir       = c674ToolsDir;
-  C674_big_endian_elf.extensions[".s"] = {suf: ".s", typ: "asm"};
-  C674_big_endian_elf.extensions[".sa"] = {suf: ".sa", typ: "asm:-fl"};
-  C674_big_endian_elf.ccOpts.prefix = "";
-  C674_big_endian_elf.profiles["release"].compileOpts.copts = "";
-  C674_big_endian_elf.$unseal("cc");
-  C674_big_endian_elf.cc.$unseal("cmd");
-  C674_big_endian_elf.cc.cmd = "cl6x -c";
-  listTargs.push(C674_big_endian_elf);
   
   
   if(covRun == 1)
    {
      C674.profiles["release"].filters = coverityFilter;
-     C674_big_endian.profiles["release"].filters = coverityFilter;
    }
   }
   else
   {
 
-     var C674_big_endian = "C674_big_endian";  
      var C674 = "C674";  
-     var C674_big_endian_elf = "C674_big_endian_elf";  
      var C674_elf = "C674_elf";  
   }
   
@@ -199,47 +173,16 @@
   C66_elf.cc.cmd = "cl6x -c";
   listTargs.push(C66_elf);
 
-
- /* Set path to the c64 big endian tools directory */
-  var C66_big_endian             = xdc.useModule('ti.targets.C66_big_endian');
-  C66_big_endian.rootDir       = c66ToolsDir;
-  C66_big_endian.extensions[".s"] = {suf: ".s", typ: "asm"};
-  C66_big_endian.extensions[".sa"] = {suf: ".sa", typ: "asm:-fl"};
-  C66_big_endian.ccOpts.prefix = "";
-  C66_big_endian.profiles["release"].compileOpts.copts = "";
-  C66_big_endian.$unseal("cc");
-  C66_big_endian.cc.$unseal("cmd");
-  C66_big_endian.cc.cmd = "cl6x -c";
-  listTargs.push(C66_big_endian);
-  
-  
-  var C66_big_endian_elf             = xdc.useModule('ti.targets.elf.C66_big_endian');
-  C66_big_endian_elf.rootDir       = c66ToolsDir;
-  C66_big_endian_elf.extensions[".s"] = {suf: ".s", typ: "asm"};
-  C66_big_endian_elf.extensions[".sa"] = {suf: ".sa", typ: "asm:-fl"};
-  C66_big_endian_elf.ccOpts.prefix = "";
-  C66_big_endian_elf.profiles["release"].compileOpts.copts = "";
-  C66_big_endian_elf.$unseal("cc");
-  C66_big_endian_elf.cc.$unseal("cmd");
-  C66_big_endian_elf.cc.cmd = "cl6x -c";
- 
-  listTargs.push(C66_big_endian_elf);
-  
-  
   if(covRun == 1)
    {
      C66.profiles["release"].filters = coverityFilter;
-     C66_big_endian.profiles["release"].filters = coverityFilter;
      C66_elf.profiles["release"].filters = coverityFilter;
-     C66_big_endian_elf.profiles["release"].filters = coverityFilter;
      
    }
   }
   else
   {
-     var C66_big_endian = "C66_big_endian";  
      var C66 = "C66";  
-     var C66_big_endian_elf = "C66_big_endian_elf";  
      var C66_elf = "C66_elf";  
      
      
@@ -272,42 +215,16 @@
   K2H_elf.cc.cmd = "cl6x -c";
   //listTargs.push(K2H_elf);
 
- /* Set path to the K2H big endian tools directory */
-  var K2H_big_endian             = xdc.useModule('ti.targets.C66_big_endian');
-  K2H_big_endian.rootDir       = K2HToolsDir;
-  K2H_big_endian.extensions[".s"] = {suf: ".s", typ: "asm"};
-  K2H_big_endian.extensions[".sa"] = {suf: ".sa", typ: "asm:-fl"};
-  K2H_big_endian.ccOpts.prefix = "";
-  K2H_big_endian.profiles["release"].compileOpts.copts = "";
-  K2H_big_endian.$unseal("cc");
-  K2H_big_endian.cc.$unseal("cmd");
-  K2H_big_endian.cc.cmd = "cl6x -c";  
-  //listTargs.push(K2H_big_endian);
-  
-  var K2H_big_endian_elf             = xdc.useModule('ti.targets.elf.C66_big_endian');
-  K2H_big_endian_elf.rootDir       = K2HToolsDir;
-  K2H_big_endian_elf.extensions[".s"] = {suf: ".s", typ: "asm"};
-  K2H_big_endian_elf.extensions[".sa"] = {suf: ".sa", typ: "asm:-fl"};
-  K2H_big_endian_elf.ccOpts.prefix = "";
-  K2H_big_endian_elf.profiles["release"].compileOpts.copts = "";
-  K2H_big_endian_elf.$unseal("cc");
-  K2H_big_endian_elf.cc.$unseal("cmd");
-  K2H_big_endian_elf.cc.cmd = "cl6x -c";  
-  //listTargs.push(K2H_big_endian_elf);
   
   if(covRun == 1)
    {
      K2H.profiles["release"].filters = coverityFilter;
      K2H_elf.profiles["release"].filters = coverityFilter; 
-     K2H_big_endian.profiles["release"].filters = coverityFilter;
-     K2H_big_endian_elf.profiles["release"].filters = coverityFilter;     
    }
   }
   else
   {
      var K2H = "K2H";
-     var K2H_big_endian = "K2H_big_endian";   
-     var K2H_big_endian_elf = "K2H_big_endian_elf";  
      var K2H_elf = "K2H_elf";       
      var AM57 = "AM57";       
   }
diff --git a/ti/mas/swtools/targParams.xs b/ti/mas/swtools/targParams.xs
index 76108a9..91f2672 100644
--- a/ti/mas/swtools/targParams.xs
+++ b/ti/mas/swtools/targParams.xs
@@ -341,24 +341,6 @@ function getTargParams(localTarget, libraryPath,armcpu,c55x_cpu_version, bundlet
             targParams.targstring="C674";                        
       break;
 
-    case C674_big_endian:       
-      targParams.libParams_speed=c64_libParams_speed;
-      targParams.libParams_size=c64_libParams_size;
-      targParams.libParams_debug=c64_libParams_debug;
-      targParams.target="c674be";
-      targParams.ext = "c674be";
-      targParams.targDirectory = "c64";   
-      targParams.platform="ti.platforms.evmDA830";
-      targParams.dstDir="c" + C674_big_endian.suffix;
-      targParams.ofd="";
-      targParams.envtoolvar="C6X_GEN_INSTALL_DIR";               
-      targParams.internaldefs=" -Dti_targets_C674_big_endian -Dxdc_target_types__=ti/targets/std.h -eo.$(OBJEXT) -ea.$(AOBJEXT) -fr=$(@D) -fs=$(@D) -ppa -ppd=$@.dep ";                          
-            targParams.internallinkdefs=" -o $@ -m $@.map";      
-      targParams.string="C67x Big Endian";
-            targParams.targstring="C674_big_endian";                                    
-      break;      
-
-
 case C674_elf:
       targParams.libParams_speed=c66_libParams_speed;
       targParams.libParams_size=c66_libParams_size;
@@ -376,23 +358,6 @@ case C674_elf:
             targParams.targstring="C674_elf";                        
       break;
 
-    case C674_big_endian_elf:       
-      targParams.libParams_speed=c66_libParams_speed;
-      targParams.libParams_size=c66_libParams_size;
-      targParams.libParams_debug=c66_libParams_debug;
-      targParams.target="ce674be";
-      targParams.ext = "ce674be";
-      targParams.targDirectory = "c64";   
-      targParams.platform="ti.platforms.evmDA830";
-      targParams.dstDir="c" + C674_big_endian_elf.suffix;
-      targParams.ofd="";
-      targParams.envtoolvar="C6X_GEN_INSTALL_DIR";               
-      targParams.internaldefs=" -Dti_targets_elf_C674_big_endian -Dxdc_target_types__=ti/targets/std.h -eo.$(OBJEXT) -ea.$(AOBJEXT) -fr=$(@D) -fs=$(@D) -ppa -ppd=$@.dep ";                          
-            targParams.internallinkdefs=" -o $@ -m $@.map";      
-      targParams.string="C67x ELF Big Endian";
-            targParams.targstring="C674_big_endian_elf";                                    
-      break;     
-      
     case C66:
       targParams.libParams_speed=c64_libParams_speed;
       targParams.libParams_size=c64_libParams_size;
@@ -410,23 +375,6 @@ case C674_elf:
             targParams.targstring="C66";                                
       break;
 
-    case C66_big_endian:       
-      targParams.libParams_speed=c64_libParams_speed;
-      targParams.libParams_size=c64_libParams_size;
-      targParams.libParams_debug=c64_libParams_debug;
-      targParams.target="c66be";
-      targParams.ext = "c66be";
-      targParams.targDirectory = "c64";   
-      targParams.platform=C66_big_endian.platform;
-      targParams.dstDir="c" + C66_big_endian.suffix;
-      targParams.ofd="";
-      targParams.envtoolvar="C6X_GEN_INSTALL_DIR";                  
-      targParams.internaldefs=" -Dti_targets_C66_big_endian -Dxdc_target_types__=ti/targets/std.h -eo.$(OBJEXT) -ea.$(AOBJEXT) -fr=$(@D) -fs=$(@D) -ppa -ppd=$@.dep ";                          
-          targParams.internallinkdefs=" -o $@ -m $@.map";      
-      targParams.string="C66x COFF Big Endian";  
-          targParams.targstring="C66_big_endian";                                  
-      break;       
-
   case C66_elf:
       targParams.libParams_speed=c66_libParams_speed;
       targParams.libParams_size=c66_libParams_size;
@@ -495,23 +443,6 @@ case C674_elf:
           targParams.targstring="AM57";                                   
       break;
 
-    case C66_big_endian_elf:       
-      targParams.libParams_speed=c66_libParams_speed;
-      targParams.libParams_size=c66_libParams_size;
-      targParams.libParams_debug=c66_libParams_debug;
-      targParams.target="ce66be";
-      targParams.ext = "ce66be";
-      targParams.targDirectory = "c64";   
-      targParams.platform=C66_big_endian_elf.platform;
-      targParams.dstDir="c" + C66_big_endian_elf.suffix;
-      targParams.ofd="";
-      targParams.envtoolvar="C6X_GEN_INSTALL_DIR";                  
-      targParams.internaldefs=" -Dti_targets_elf_C66_big_endian -Dxdc_target_types__=ti/targets/std.h -eo.$(OBJEXT) -ea.$(AOBJEXT) -fr=$(@D) -fs=$(@D) -ppa -ppd=$@.dep ";                          
-          targParams.internallinkdefs=" --reread_libs -o $@ -m $@.map";      
-      targParams.string="C66x ELF Big Endian";   
-          targParams.targstring="C66_big_endian_elf";                                 
-      break;    
-
     case C64P:
       targParams.libParams_speed=c64_libParams_speed;
       targParams.libParams_size=c64_libParams_size;
@@ -679,4 +610,4 @@ case C674_elf:
            targParams.libpath=libraryPath;  
             
      return(targParams);
-}
\ No newline at end of file
+}