diff options
author | Raghu Nambiath | 2017-10-18 14:30:08 -0500 |
---|---|---|
committer | Raghu Nambiath | 2017-10-18 14:30:08 -0500 |
commit | 0543a50ea191e2558a5d263b3348c7b09e978e95 (patch) | |
tree | 428bd0644b647350929edbf94b76090b7e447e0b | |
parent | 1e429a61790a3f69a9d1c7252dd2604c4aa04bd3 (diff) | |
parent | fac52b3a737d1021ee32c84ed663e9302a1dab9a (diff) | |
download | fftlib-0543a50ea191e2558a5d263b3348c7b09e978e95.tar.gz fftlib-0543a50ea191e2558a5d263b3348c7b09e978e95.tar.xz fftlib-0543a50ea191e2558a5d263b3348c7b09e978e95.zip |
Merge pull request #2 in PROC_LIBS/fftlib from rtos-next to master
* commit 'fac52b3a737d1021ee32c84ed663e9302a1dab9a':
PRSDK-3125: Removing C64 targets as per the sysbios update 6.52.00.12
-rw-r--r-- | ti/mas/swtools/CommonBld.xs | 2 | ||||
-rw-r--r-- | ti/mas/swtools/config.bld | 30 | ||||
-rw-r--r-- | ti/mas/swtools/targParams.xs | 32 |
3 files changed, 1 insertions, 63 deletions
diff --git a/ti/mas/swtools/CommonBld.xs b/ti/mas/swtools/CommonBld.xs index a9e4132..35ae470 100644 --- a/ti/mas/swtools/CommonBld.xs +++ b/ti/mas/swtools/CommonBld.xs | |||
@@ -173,7 +173,7 @@ function parseArgs(arguments) | |||
173 | /* Check if the package is target independent */ | 173 | /* Check if the package is target independent */ |
174 | if(targets==undefined) | 174 | if(targets==undefined) |
175 | { | 175 | { |
176 | targets = [C54, C54_far, C55, C55_large, C64, C64_big_endian, C674, C674_big_endian, C674_elf, C674_big_endian_elf, C64P, C64P_big_endian, C66, C66_big_endian, C64P_elf, C64P_big_endian_elf, C66_elf, C66_big_endian_elf, K2H, K2H_big_endian, K2H_elf, K2H_big_endian_elf, MVArm9, GCArmv6, GCArmv7A, WinCE, VC98, TIArmv6le, TIArmv6be]; | 176 | targets = [C54, C54_far, C55, C55_large, C674, C674_big_endian, C674_elf, C674_big_endian_elf, C64P, C64P_big_endian, C66, C66_big_endian, C64P_elf, C64P_big_endian_elf, C66_elf, C66_big_endian_elf, K2H, K2H_big_endian, K2H_elf, K2H_big_endian_elf, MVArm9, GCArmv6, GCArmv7A, WinCE, VC98, TIArmv6le, TIArmv6be]; |
177 | /* Target Independent */ | 177 | /* Target Independent */ |
178 | targ_indp=true; | 178 | targ_indp=true; |
179 | } | 179 | } |
diff --git a/ti/mas/swtools/config.bld b/ti/mas/swtools/config.bld index c89497f..123f2d4 100644 --- a/ti/mas/swtools/config.bld +++ b/ti/mas/swtools/config.bld | |||
@@ -314,31 +314,6 @@ | |||
314 | var c64ToolsDir = java.lang.System.getenv("C64CODEGENTOOL"); //This variable is set by CYGWINXDC.BAT | 314 | var c64ToolsDir = java.lang.System.getenv("C64CODEGENTOOL"); //This variable is set by CYGWINXDC.BAT |
315 | if(c64ToolsDir != undefined) | 315 | if(c64ToolsDir != undefined) |
316 | { | 316 | { |
317 | /* Set path to the c64 tools directory */ | ||
318 | var C64 = xdc.useModule('ti.targets.C64'); | ||
319 | C64.rootDir = c64ToolsDir; | ||
320 | C64.extensions[".s"] = {suf: ".s", typ: "asm"}; | ||
321 | C64.extensions[".sa"] = {suf: ".sa", typ: "asm:-fl"}; | ||
322 | C64.ccOpts.prefix = ""; | ||
323 | C64.profiles["release"].compileOpts.copts = ""; | ||
324 | |||
325 | C64.$unseal("cc"); | ||
326 | C64.cc.$unseal("cmd"); | ||
327 | C64.cc.cmd = "cl6x -c"; | ||
328 | listTargs.push(C64); | ||
329 | |||
330 | /* Set path to the c64 big endian tools directory */ | ||
331 | var C64_big_endian = xdc.useModule('ti.targets.C64_big_endian'); | ||
332 | C64_big_endian.rootDir = c64ToolsDir; | ||
333 | C64_big_endian.extensions[".s"] = {suf: ".s", typ: "asm"}; | ||
334 | C64_big_endian.extensions[".sa"] = {suf: ".sa", typ: "asm:-fl"}; | ||
335 | C64_big_endian.ccOpts.prefix = ""; | ||
336 | C64_big_endian.profiles["release"].compileOpts.copts = ""; | ||
337 | C64_big_endian.$unseal("cc"); | ||
338 | C64_big_endian.cc.$unseal("cmd"); | ||
339 | C64_big_endian.cc.cmd = "cl6x -c"; | ||
340 | listTargs.push(C64_big_endian); | ||
341 | |||
342 | /* Set path to the c64Plus tools directory */ | 317 | /* Set path to the c64Plus tools directory */ |
343 | var C64P = xdc.useModule('ti.targets.C64P'); | 318 | var C64P = xdc.useModule('ti.targets.C64P'); |
344 | C64P.rootDir = c64ToolsDir; | 319 | C64P.rootDir = c64ToolsDir; |
@@ -389,9 +364,6 @@ | |||
389 | 364 | ||
390 | if(covRun == 1) | 365 | if(covRun == 1) |
391 | { | 366 | { |
392 | C64.profiles["release"].filters = coverityFilter; | ||
393 | C64_big_endian.profiles["release"].filters = coverityFilter; | ||
394 | |||
395 | C64P.profiles["release"].filters = coverityFilter; | 367 | C64P.profiles["release"].filters = coverityFilter; |
396 | C64P_big_endian.profiles["release"].filters = coverityFilter; | 368 | C64P_big_endian.profiles["release"].filters = coverityFilter; |
397 | C64P_elf.profiles["release"].filters = coverityFilter; | 369 | C64P_elf.profiles["release"].filters = coverityFilter; |
@@ -404,8 +376,6 @@ | |||
404 | var C64P = "C64P"; | 376 | var C64P = "C64P"; |
405 | var C64P_big_endian_elf = "C64P_big_endian_elf"; | 377 | var C64P_big_endian_elf = "C64P_big_endian_elf"; |
406 | var C64P_elf = "C64P_elf"; | 378 | var C64P_elf = "C64P_elf"; |
407 | var C64_big_endian = "C64_big_endian"; | ||
408 | var C64 = "C64"; | ||
409 | } | 379 | } |
410 | 380 | ||
411 | var mvarm9ToolsDir = java.lang.System.getenv("MVARM9CGTOOL"); //This variable is set by CYGWINXDC.BAT | 381 | var mvarm9ToolsDir = java.lang.System.getenv("MVARM9CGTOOL"); //This variable is set by CYGWINXDC.BAT |
diff --git a/ti/mas/swtools/targParams.xs b/ti/mas/swtools/targParams.xs index abbc177..c0cbce1 100644 --- a/ti/mas/swtools/targParams.xs +++ b/ti/mas/swtools/targParams.xs | |||
@@ -323,39 +323,7 @@ function getTargParams(localTarget, libraryPath,armcpu,c55x_cpu_version, bundlet | |||
323 | 323 | ||
324 | break; | 324 | break; |
325 | 325 | ||
326 | case C64: | ||
327 | targParams.libParams_speed=c64_libParams_speed; | ||
328 | targParams.libParams_size=c64_libParams_size; | ||
329 | targParams.libParams_debug=c64_libParams_debug; | ||
330 | targParams.target="c64le"; | ||
331 | targParams.ext = "c64le"; | ||
332 | targParams.targDirectory = "c64"; | ||
333 | targParams.platform="ti.platforms.sim64xx"; | ||
334 | targParams.dstDir="c" + C64.suffix; | ||
335 | targParams.ofd=C64.rootDir.toString().replace(/\\/g,"\/")+"/bin/ofd6x"; | ||
336 | targParams.envtoolvar="C6X_GEN_INSTALL_DIR"; | ||
337 | targParams.internaldefs=" -Dti_targets_C64 -Dxdc_target_types__=ti/targets/std.h -eo.$(OBJEXT) -ea.$(AOBJEXT) -fr=$(@D) -fs=$(@D) -ppa -ppd=$@.dep "; | ||
338 | targParams.internallinkdefs=" -o $@ -m $@.map"; | ||
339 | targParams.string="C64x Little Endian"; | ||
340 | targParams.targstring="C64"; | ||
341 | break; | ||
342 | 326 | ||
343 | case C64_big_endian: | ||
344 | targParams.libParams_speed=c64_libParams_speed; | ||
345 | targParams.libParams_size=c64_libParams_size; | ||
346 | targParams.libParams_debug=c64_libParams_debug; | ||
347 | targParams.target="c64be"; | ||
348 | targParams.ext = "c64be"; | ||
349 | targParams.targDirectory = "c64"; | ||
350 | targParams.platform="ti.platforms.sim64xx"; | ||
351 | targParams.dstDir="c" + C64_big_endian.suffix; | ||
352 | targParams.ofd=C64_big_endian.rootDir.toString().replace(/\\/g,"\/")+"/bin/ofd6x"; | ||
353 | targParams.envtoolvar="C6X_GEN_INSTALL_DIR"; | ||
354 | targParams.internaldefs=" -Dti_targets_C64_big_endian -Dxdc_target_types__=ti/targets/std.h -eo.$(OBJEXT) -ea.$(AOBJEXT) -fr=$(@D) -fs=$(@D) -ppa -ppd=$@.dep "; | ||
355 | targParams.internallinkdefs=" -o $@ -m $@.map"; | ||
356 | targParams.string="C64x Big Endian"; | ||
357 | targParams.targstring="C64_big_endian"; | ||
358 | break; | ||
359 | 327 | ||
360 | case C674: | 328 | case C674: |
361 | targParams.libParams_speed=c64_libParams_speed; | 329 | targParams.libParams_speed=c64_libParams_speed; |