From 723dd35cad7e495efa3ce2c51e4e21d985fb51b2 Mon Sep 17 00:00:00 2001
From: "NoMaY (a user of Japan.RenesasRulz.com)" <NoMaY-jp@outlook.com>
Date: Sat, 19 Sep 2020 08:04:15 +0900
Subject: [PATCH] 
 Upgrade_GCC_project_for_e2v780_in_RX700_RX71M_RSK_GCC_e2studio_IAR (#257)

Co-authored-by: Ming Yue <mingyue86010@gmail.com>
---
 .../.HardwareDebuglinker                      | 148 -----------
 .../.cproject                                 | 236 +++++++++++-------
 .../RX700_RX71M_RSK_GCC_e2studio_IAR/.info    |   7 -
 .../RX700_RX71M_RSK_GCC_e2studio_IAR/.project |   5 +-
 .../Dependency_Scan_Preferences.prefs         |   4 -
 .../Project_Generation_Prefrences.prefs       |  23 --
 .../.settings/language.settings.xml           |   4 +-
 .../RTOSDemo HardwareDebug.launch             |  25 +-
 .../custom.bat                                |   0
 .../makefile.init                             |   5 -
 .../src/linker_scriptHardwareDebug.ld         | 142 +++++++++++
 11 files changed, 305 insertions(+), 294 deletions(-)
 delete mode 100644 FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.HardwareDebuglinker
 delete mode 100644 FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.info
 delete mode 100644 FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.settings/Dependency_Scan_Preferences.prefs
 delete mode 100644 FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.settings/Project_Generation_Prefrences.prefs
 delete mode 100644 FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/custom.bat
 delete mode 100644 FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/makefile.init
 create mode 100644 FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/src/linker_scriptHardwareDebug.ld

diff --git a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.HardwareDebuglinker b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.HardwareDebuglinker
deleted file mode 100644
index d89b961f8c..0000000000
--- a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.HardwareDebuglinker
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<com.renesas.linkersection.model:SectionContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:com.renesas.linkersection.model="http:///LinkerSection.ecore" targets="GNU_RX">
-  <definedRegionsList name="RAM">
-    <startAddress xsi:type="com.renesas.linkersection.model:FixedAddress"/>
-    <endAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="524287"/>
-  </definedRegionsList>
-  <definedRegionsList name="ROM">
-    <startAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4290772992"/>
-    <endAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967295"/>
-  </definedRegionsList>
-  <definedRegionsList name="OFS">
-    <startAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1179648"/>
-    <endAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1179903"/>
-  </definedRegionsList>
-  <sections name=".fvectors" isKeep="true">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967292"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".fvectors"/>
-  </sections>
-  <sections name=".exvectors" isKeep="true">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4294967168"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".exvectors"/>
-  </sections>
-  <sections name=".text">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="4290772992"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".text"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".text.*"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name="P"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="etext"/>
-  </sections>
-  <sections name=".rvectors" isKeep="true">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:ReferencedSectionAddress" referencedSection="//@sections.2"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="_rvectors_start"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".rvectors"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="_rvectors_end"/>
-  </sections>
-  <sections name=".init">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:ReferencedSectionAddress" referencedSection="//@sections.3"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".init"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="__preinit_array_start"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".preinit_array"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="__preinit_array_end"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="__init_array_start = (. + 3) &amp; ~ 3"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".init_array"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name="SORT(.init_array.*)"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="__init_array_end"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="__fini_array_start"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".fini_array"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name="SORT(.fini_array.*)"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="__fini_array_end"/>
-  </sections>
-  <sections name=".fini">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:ReferencedSectionAddress" referencedSection="//@sections.4"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".fini"/>
-  </sections>
-  <sections name=".got">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:ReferencedSectionAddress" referencedSection="//@sections.5"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".got"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".got.plt"/>
-  </sections>
-  <sections name=".rodata">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:ReferencedSectionAddress" referencedSection="//@sections.6"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".rodata"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".rodata.*"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name="C_1"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name="C_2"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name="C"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="_erodata"/>
-  </sections>
-  <sections name=".eh_frame_hdr">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:ReferencedSectionAddress" referencedSection="//@sections.7"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".eh_frame_hdr"/>
-  </sections>
-  <sections name=".eh_frame">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:ReferencedSectionAddress" referencedSection="//@sections.8"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".eh_frame"/>
-  </sections>
-  <sections name=".jcr">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:ReferencedSectionAddress" referencedSection="//@sections.9"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".jcr"/>
-  </sections>
-  <sections name=".tors">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:ReferencedSectionAddress" referencedSection="//@sections.10"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="__CTOR_LIST__"/>
-    <contents xsi:type="com.renesas.linkersection.model:Keyword" text=". = ALIGN(2)"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="___ctors"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".ctors"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="___ctors_end"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="__CTOR_END__"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="__DTOR_LIST__"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="___dtors"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".dtors"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="___dtors_end"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="__DTOR_END__"/>
-    <contents xsi:type="com.renesas.linkersection.model:Keyword" text=". = ALIGN(2)"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="_mdata"/>
-  </sections>
-  <sections name=".ofs4" isKeep="true">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1179744"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".ofs4"/>
-  </sections>
-  <sections name=".ofs3" isKeep="true">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1179728"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".ofs3"/>
-  </sections>
-  <sections name=".ofs2" isKeep="true">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1179720"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".ofs2"/>
-  </sections>
-  <sections name=".ofs1" isKeep="true">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1179712"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".ofs1"/>
-  </sections>
-  <sections name=".data">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1540"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="_data"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".data"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".data.*"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name="D"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name="D_1"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name="D_2"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="_edata"/>
-    <reservedMemAddress xsi:type="com.renesas.linkersection.model:ReferencedLabelAddress" label="//@sections.11/@contents.12"/>
-  </sections>
-  <sections name=".gcc_exc">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:ReferencedSectionAddress" referencedSection="//@sections.16"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".gcc_exc"/>
-  </sections>
-  <sections name=".bss">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:ReferencedSectionAddress" referencedSection="//@sections.17"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="_bss"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".bss"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name=".bss.**"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name="COMMON"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name="B"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name="B_1"/>
-    <contents xsi:type="com.renesas.linkersection.model:WildCardExpression" specificSection="true" name="B_2"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="_ebss"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="_end"/>
-  </sections>
-  <sections name=".ustack" isKeep="true">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="1536"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="_ustack"/>
-  </sections>
-  <sections name=".istack" isKeep="true">
-    <sectionAddress xsi:type="com.renesas.linkersection.model:FixedAddress" fixedAddress="768"/>
-    <contents xsi:type="com.renesas.linkersection.model:Label" rhs="= .;" lhs="_istack"/>
-  </sections>
-</com.renesas.linkersection.model:SectionContainer>
diff --git a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.cproject b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.cproject
index d10a5590dc..f62b10def7 100644
--- a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.cproject
+++ b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.cproject
@@ -1,50 +1,55 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="%com.renesas.cdt.rx.hardwaredebug.win32.configuration.Id.363159113">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="%com.renesas.cdt.rx.hardwaredebug.win32.configuration.Id.363159113" moduleId="org.eclipse.cdt.core.settings" name="HardwareDebug">
+		<cconfiguration id="com.renesas.cdt.managedbuild.gcc.rx.configuration.debug.2055427153">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.renesas.cdt.managedbuild.gcc.rx.configuration.debug.2055427153" moduleId="org.eclipse.cdt.core.settings" name="HardwareDebug">
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
+			<storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
+				<option id="toolchain.id" value="GNU_RX"/>
+				<option id="toolchain.version" value="v15.01"/>
+				<option id="toolchain.enable" value="true"/>
+			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="RTOSDemo" buildArtefactType="com.renesas.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=com.renesas.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf *.lst *.lis *.lpp *.map" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="%com.renesas.cdt.rx.hardwaredebug.win32.configuration.Id.363159113" name="HardwareDebug" parent="%com.renesas.cdt.rx.hardwaredebug.win32.configuration.Id">
-					<folderInfo id="%com.renesas.cdt.rx.hardwaredebug.win32.configuration.Id.363159113." name="/" resourcePath="">
-						<toolChain id="%com.renesas.cdt.rx.hardwaredebug.win32.toolChain.Id.631020074" name="KPIT GNURX-ELF Toolchain" superClass="%com.renesas.cdt.rx.hardwaredebug.win32.toolChain.Id">
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE" id="com.renesas.cdt.rx.hardwaredebug.win32.targetPlatform.Id.923953984" osList="win32" superClass="com.renesas.cdt.rx.hardwaredebug.win32.targetPlatform.Id"/>
-							<builder buildPath="${workspace_loc:/RTOSDemo}/HardwareDebug" id="com.renesas.cdt.rx.hardwaredebug.win32.builder.Id.1390009184" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="GNU Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.rx.hardwaredebug.win32.builder.Id"/>
-							<tool id="com.renesas.cdt.rx.hardwaredebug.win32.tool.libgen.Id.389462334" name="Library Generator" superClass="com.renesas.cdt.rx.hardwaredebug.win32.tool.libgen.Id">
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.stdio.136196100" name="stdio.h : Performs input/output handling" superClass="com.renesas.cdt.core.LibraryGenerator.option.stdio" value="true" valueType="boolean"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.stdlib.750063740" name="stdlib.h : Performs C program standard processing such as storage area management" superClass="com.renesas.cdt.core.LibraryGenerator.option.stdlib" value="true" valueType="boolean"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.string.1716599463" name="string.h : Performs string comparison, copying " superClass="com.renesas.cdt.core.LibraryGenerator.option.string" value="true" valueType="boolean"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.selectLibrary.834440544" name="Select library" superClass="com.renesas.cdt.core.LibraryGenerator.option.selectLibrary" value="com.renesas.core.LibraryGenerator.option.selectLibrary.optimized" valueType="enumerated"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.libraryType.1914772863" name="Library type" superClass="com.renesas.cdt.core.LibraryGenerator.option.libraryType" value="com.renesas.cdt.core.LibraryGenerator.option.libraryType.projectBuilt" valueType="enumerated"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.misc9.23430327" name="Place each function into its own section in the output file(-ffunction-sections)" superClass="com.renesas.cdt.core.LibraryGenerator.option.misc9" value="true" valueType="boolean"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.misc14.204510735" name="Do not put function addresses in registers(-fno-function-cse)" superClass="com.renesas.cdt.core.LibraryGenerator.option.misc14" value="false" valueType="boolean"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.misc43.666321653" name="Avoid keeping the whole uncompressed sections in memory, only retaining the compressed ones (-flto-compression-level=0)" superClass="com.renesas.cdt.core.LibraryGenerator.option.misc43" value="true" valueType="boolean"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.misc10.909013433" name="Place each data into its own section in the output file(-fdata-sections)" superClass="com.renesas.cdt.core.LibraryGenerator.option.misc10" value="false" valueType="boolean"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.misc38.865400222" name="To reduce the number of symbolic address calculations by using shared &quot;anchor&quot; symbols (-fsection-anchors)" superClass="com.renesas.cdt.core.LibraryGenerator.option.misc38" value="true" valueType="boolean"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.misc40.613710093" name="To remove redundant extension instructions (-free)" superClass="com.renesas.cdt.core.LibraryGenerator.option.misc40" value="true" valueType="boolean"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.misc44.2019282314" name="Do not scan through jump instructions in CSE when the target of the jump is not reached (-fno-cse-follow-jumps)" superClass="com.renesas.cdt.core.LibraryGenerator.option.misc44" value="true" valueType="boolean"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.misc45.527177923" name="Do not use jump tables for switch statements (-fno-jump-tables)" superClass="com.renesas.cdt.core.LibraryGenerator.option.misc45" value="true" valueType="boolean"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.misc46.1183537256" name="Do not guess branch probabilities using heuristics (-fno-guess-branch-probability) " superClass="com.renesas.cdt.core.LibraryGenerator.option.misc46" value="true" valueType="boolean"/>
-								<option id="com.renesas.cdt.core.LibraryGenerator.option.misc48.1413534833" name="Disable  the loop invariant motion pass in the RTL loop optimizer (-fno-move-loop-invariants)" superClass="com.renesas.cdt.core.LibraryGenerator.option.misc48" value="true" valueType="boolean"/>
+				<configuration artifactExtension="x" artifactName="RTOSDemo" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf *.lst *.lis *.lpp *.map" description="" id="com.renesas.cdt.managedbuild.gcc.rx.configuration.debug.2055427153" name="HardwareDebug" parent="com.renesas.cdt.managedbuild.gcc.rx.configuration.debug">
+					<folderInfo id="com.renesas.cdt.managedbuild.gcc.rx.configuration.debug.2055427153." name="/" resourcePath="">
+						<toolChain id="com.renesas.cdt.managedbuild.gcc.rx.toolchain.debug.1458765129" name="GCC for Renesas RX" superClass="com.renesas.cdt.managedbuild.gcc.rx.toolchain.debug">
+							<option id="com.renesas.cdt.managedbuild.gcc.core.option.optimization.optimizationLevel.1301939058" name="Optimization Level" superClass="com.renesas.cdt.managedbuild.gcc.core.option.optimization.optimizationLevel" value="com.renesas.cdt.managedbuild.gcc.core.option.optimization.optimizationLevel" valueType="enumerated"/>
+							<option id="com.renesas.cdt.managedbuild.gcc.core.option.optimization.fdatasections.14140109" name="Data sections (-fdata-sections)" superClass="com.renesas.cdt.managedbuild.gcc.core.option.optimization.fdatasections" value="false" valueType="boolean"/>
+							<option id="com.renesas.cdt.managedbuild.gcc.core.option.debug.debugFormat.385697040" name="Debug format" superClass="com.renesas.cdt.managedbuild.gcc.core.option.debug.debugFormat" value="com.renesas.cdt.managedbuild.gcc.core.option.debug.debugFormat.Default" valueType="enumerated"/>
+							<option id="com.renesas.cdt.managedbuild.gcc.core.option.cpu.cpuType.2005587347" name="CPU Type" superClass="com.renesas.cdt.managedbuild.gcc.core.option.cpu.cpuType" value="com.renesas.cdt.managedbuild.gcc.core.option.cpu.cpuType.rx64m" valueType="enumerated"/>
+							<option id="com.renesas.cdt.managedbuild.gcc.core.option.deviceCommand.838209906" name="DeviceCommand" superClass="com.renesas.cdt.managedbuild.gcc.core.option.deviceCommand" value="R5F571ML" valueType="string"/>
+							<option id="com.renesas.cdt.managedbuild.gcc.core.option.deviceShortName.1878812411" name="DeviceName" superClass="com.renesas.cdt.managedbuild.gcc.core.option.deviceShortName" value="R5F571MLCxFC" valueType="string"/>
+							<option id="com.renesas.cdt.managedbuild.gcc.core.option.cpu.disableFPUInstructions.2043642479" name="Disable generation of RX hardware FPU instructions" superClass="com.renesas.cdt.managedbuild.gcc.core.option.cpu.disableFPUInstructions" value="false" valueType="boolean"/>
+							<option id="com.renesas.cdt.managedbuild.gcc.core.option.debug.debugLevel.1467811031" name="Debug level" superClass="com.renesas.cdt.managedbuild.gcc.core.option.debug.debugLevel" value="com.renesas.cdt.managedbuild.gcc.core.option.debug.debugLevel.level2" valueType="enumerated"/>
+							<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.core.option.debug.otherFlags.1052400853" name="Other flags" superClass="com.renesas.cdt.managedbuild.gcc.core.option.debug.otherFlags" valueType="stringList">
+								<listOptionValue builtIn="false" value="-g"/>
+							</option>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.renesas.cdt.managedbuild.gcc.core.targetPlatform.786569026" isAbstract="false" osList="all" superClass="com.renesas.cdt.managedbuild.gcc.core.targetPlatform"/>
+							<builder buildPath="${workspace_loc:/RTOSDemo}/HardwareDebug" id="com.renesas.cdt.managedbuild.gcc.core.builder.619529182" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.core.builder"/>
+							<tool id="com.renesas.cdt.managedbuild.gcc.rx.tool.libgen.907046069" name="Library Generator" superClass="com.renesas.cdt.managedbuild.gcc.rx.tool.libgen">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.core.option.librarygenerator.settings.userDefinedCompiler.1080831229" name="User defined compiler options" superClass="com.renesas.cdt.managedbuild.gcc.core.option.librarygenerator.settings.userDefinedCompiler" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Os"/>
+									<listOptionValue builtIn="false" value="-ffunction-sections"/>
+									<listOptionValue builtIn="false" value="-fsection-anchors"/>
+									<listOptionValue builtIn="false" value="-free"/>
+									<listOptionValue builtIn="false" value="-flto-compression-level=0"/>
+									<listOptionValue builtIn="false" value="-fno-cse-follow-jumps"/>
+									<listOptionValue builtIn="false" value="-fno-jump-tables"/>
+									<listOptionValue builtIn="false" value="-fno-guess-branch-probability"/>
+									<listOptionValue builtIn="false" value="-fno-move-loop-invariants"/>
+								</option>
 							</tool>
-							<tool id="com.renesas.cdt.rx.hardwaredebug.win32.tool.compiler.Id.1716300087" name="Compiler" superClass="com.renesas.cdt.rx.hardwaredebug.win32.tool.compiler.Id">
-								<option defaultValue="true" id="com.renesas.cdt.core.Compiler.option.misc2.1022430178" name="Don't search standard system directories for header files(-nostdinc)" superClass="com.renesas.cdt.core.Compiler.option.misc2" value="false" valueType="boolean"/>
-								<option id="com.renesas.cdt.rx.HardwareDebug.Compiler.option.dataEndian.32668715" name="Data Endian" superClass="com.renesas.cdt.rx.HardwareDebug.Compiler.option.dataEndian" value="com.renesas.cdt.rx.HardwareDebug.Compiler.option.dataEndian.little" valueType="enumerated"/>
-								<option id="com.renesas.cdt.rx.HardwareDebug.Compiler.option.make64bitDouble.390975447" name="Make the double data type 64-bits wide " superClass="com.renesas.cdt.rx.HardwareDebug.Compiler.option.make64bitDouble" value="false" valueType="boolean"/>
-								<option id="com.renesas.cdt.rx.HardwareDebug.Compiler.option.cpuType.855519458" name="CPU type" superClass="com.renesas.cdt.rx.HardwareDebug.Compiler.option.cpuType" value="com.renesas.cdt.rx.HardwareDebug.Compiler.option.cpuType.rx600" valueType="enumerated"/>
-								<option command="-mcpu=rx64m" commandFalse="-mcpu=rx600" id="com.renesas.cdt.rx.HardwareDebug.Compiler.option.genCodeForRX64M.382136227" name="Generate code for RXv2 target" superClass="com.renesas.cdt.rx.HardwareDebug.Compiler.option.genCodeForRX64M" value="true" valueType="boolean"/>
-								<option id="com.renesas.cdt.core.Compiler.option.device.1648089218" name="Device" superClass="com.renesas.cdt.core.Compiler.option.device" value="R5F571ML" valueType="string"/>
-								<option id="com.renesas.cdt.core.Compiler.option.deviceShortName.339321196" name="DeviceShortName" superClass="com.renesas.cdt.core.Compiler.option.deviceShortName" value="R5F571MLCxFC" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.core.Compiler.option.includeFileDir.1486703917" name="Include file directories" superClass="com.renesas.cdt.core.Compiler.option.includeFileDir" valueType="includePath">
+							<tool id="com.renesas.cdt.managedbuild.gcc.rx.tool.compiler.143882209" name="Compiler" superClass="com.renesas.cdt.managedbuild.gcc.rx.tool.compiler">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.core.option.compiler.includes.includeFileDir.822385023" name="Include file directories" superClass="com.renesas.cdt.managedbuild.gcc.core.option.compiler.includes.includeFileDir" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${TCINSTALL}/rx-elf/optlibinc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/Full_Demo/FreeRTOS-Plus-CLI}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/Full_Demo}&quot;"/>
@@ -54,70 +59,112 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/FreeRTOS_Source/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/FreeRTOS_Source/portable/GCC/RX600v2}&quot;"/>
 								</option>
-								<option id="com.renesas.cdt.core.Compiler.option.CPUSeries.1680137458" name="Cpu Series" superClass="com.renesas.cdt.core.Compiler.option.CPUSeries" value="RX71M" valueType="string"/>
-								<option id="com.renesas.cdt.rx.HardwareDebug.Compiler.option.optimizationLevel.1027551725" name="Optimization level" superClass="com.renesas.cdt.rx.HardwareDebug.Compiler.option.optimizationLevel" value="com.renesas.cdt.rx.HardwareDebug.Compiler.option.optimizationLevel.none" valueType="enumerated"/>
-								<option id="com.renesas.cdt.core.Compiler.option.misc67.85744271" name="Do not Inline functions early before doing `-fprofile-generate' instrumentation and real inlining pass (-fno-early-inlining)" superClass="com.renesas.cdt.core.Compiler.option.misc67" value="false" valueType="boolean"/>
-								<inputType id="%Base.Compiler.C.InputType.Id.796988690" name="C Input" superClass="%Base.Compiler.C.InputType.Id"/>
-								<inputType id="Base.Compiler.CPP.InputType.Id.1567835364" name="C++ Input" superClass="Base.Compiler.CPP.InputType.Id"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.core.option.compiler.includes.macroDefines.202820754" name="Macro Defines" superClass="com.renesas.cdt.managedbuild.gcc.core.option.compiler.includes.macroDefines" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="__RX_LITTLE_ENDIAN__=1"/>
+								</option>
+								<inputType id="com.renesas.cdt.managedbuild.gcc.core.inputType.compiler.c.1464599974" superClass="com.renesas.cdt.managedbuild.gcc.core.inputType.compiler.c"/>
 							</tool>
-							<tool id="com.renesas.cdt.rx.hardwaredebug.win32.tool.assembler.Id.174601268" name="Assembler" superClass="com.renesas.cdt.rx.hardwaredebug.win32.tool.assembler.Id">
-								<option id="com.renesas.cdt.rx.HardwareDebug.Assembler.option.dataEndian.264941709" name="Data Endian" superClass="com.renesas.cdt.rx.HardwareDebug.Assembler.option.dataEndian" value="com.renesas.cdt.rx.HardwareDebug.Assembler.option.dataEndian.little" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.core.Assembler.option.includeFileDirectories.1534038057" name="Include file directories" superClass="com.renesas.cdt.core.Assembler.option.includeFileDirectories" valueType="includePath">
+							<tool id="com.renesas.cdt.managedbuild.gcc.rx.tool.cpp.compiler.396153609" name="Compiler CPP" superClass="com.renesas.cdt.managedbuild.gcc.rx.tool.cpp.compiler">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.core.option.compiler.includes.includeFileDir.732160067" name="Include file directories" superClass="com.renesas.cdt.managedbuild.gcc.core.option.compiler.includes.includeFileDir" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${TCINSTALL}/rx-elf/optlibinc&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/Full_Demo/FreeRTOS-Plus-CLI}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/Full_Demo}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/Full_Demo/Standard_Demo_Tasks/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/cg_src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/FreeRTOS_Source/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/FreeRTOS_Source/portable/GCC/RX600v2}&quot;"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.core.option.compiler.includes.macroDefines.1084835081" name="Macro Defines" superClass="com.renesas.cdt.managedbuild.gcc.core.option.compiler.includes.macroDefines" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="__RX_LITTLE_ENDIAN__=1"/>
+								</option>
+							</tool>
+							<tool id="com.renesas.cdt.managedbuild.gcc.rx.tool.assembler.483305851" name="Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rx.tool.assembler">
+								<option id="com.renesas.cdt.managedbuild.gcc.core.option.assembler.source.usepreprocessor.496505621" name="Use preprocessor" superClass="com.renesas.cdt.managedbuild.gcc.core.option.assembler.source.usepreprocessor"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.core.option.assembler.includes.includeFileDirectories.258832478" name="Include file directories" superClass="com.renesas.cdt.managedbuild.gcc.core.option.assembler.includes.includeFileDirectories" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/src&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/src&quot;"/>
 								</option>
-								<inputType id="%Base.Assembler.inputType.Id.256152581" name="Assembler InputType" superClass="%Base.Assembler.inputType.Id"/>
+								<inputType id="com.renesas.cdt.managedbuild.gcc.core.inputType.assembler.1290706202" superClass="com.renesas.cdt.managedbuild.gcc.core.inputType.assembler"/>
 							</tool>
-							<tool id="com.renesas.cdt.rx.hardwaredebug.win32.tool.linker.Id.356767296" name="Linker" superClass="com.renesas.cdt.rx.hardwaredebug.win32.tool.linker.Id">
-								<option id="com.renesas.cdt.rx.HardwareDebug.Linker.option.dataEndian.937661957" name="Data Endian" superClass="com.renesas.cdt.rx.HardwareDebug.Linker.option.dataEndian" value="com.renesas.cdt.rx.HardwareDebug.Linker.option.dataEndian.little" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.rx.HardwareDebug.Linker.option.archiveSearchDirectories.883746544" name="Archive search directories" superClass="com.renesas.cdt.rx.HardwareDebug.Linker.option.archiveSearchDirectories" valueType="stringList">
-									<listOptionValue builtIn="false" value="&quot;${CONFIGDIR}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${TCINSTALL}/lib/gcc/rx-elf/${GCC_VERSION}&quot;"/>
+							<tool id="com.renesas.cdt.managedbuild.gcc.rx.tool.linker.79904051" name="Linker" superClass="com.renesas.cdt.managedbuild.gcc.rx.tool.linker">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.rx.option.linker.archives.archiveSearchDirectories.1951968124" name="Standard archive search directories" superClass="com.renesas.cdt.managedbuild.gcc.rx.option.linker.archives.archiveSearchDirectories" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="&quot;${CWD}&quot;"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.rx.HardwareDebug.Linker.option.archiveLibraryFiles.301227213" name="Archive (library) files" superClass="com.renesas.cdt.rx.HardwareDebug.Linker.option.archiveLibraryFiles" valueType="stringList">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.core.option.linker.other.userDefinedOptions.2117491896" name="User defined options" superClass="com.renesas.cdt.managedbuild.gcc.core.option.linker.other.userDefinedOptions" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wl,-e_PowerON_Reset"/>
+								</option>
+								<option id="com.renesas.cdt.managedbuild.gcc.core.option.linker.entrypoint.228795841" name="Entry point:" superClass="com.renesas.cdt.managedbuild.gcc.core.option.linker.entrypoint" useByScannerDiscovery="false" value="" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.core.option.linker.source.linkerScript.1519854516" name="Linker script" superClass="com.renesas.cdt.managedbuild.gcc.core.option.linker.source.linkerScript" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/src/linker_scriptHardwareDebug.ld&quot;"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.core.option.linker.source.linkOrderList.148114428" name="Linkage Order List" superClass="com.renesas.cdt.managedbuild.gcc.core.option.linker.source.linkOrderList" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="&quot;./src/main.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/cg_src/r_cg_cgc.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/cg_src/r_cg_cgc_user.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/cg_src/r_cg_hardware_setup.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/cg_src/r_cg_icu.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/cg_src/r_cg_icu_user.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/cg_src/r_cg_port.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/cg_src/r_cg_port_user.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/cg_src/r_cg_sbrk.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/cg_src/r_cg_sci.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/cg_src/r_cg_sci_user_gcc.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Renesas_Source/interrupt_handlers.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Renesas_Source/reset_program.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Renesas_Source/vector_table.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/IntQueueTimer.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/RegTest_GCC.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Sample-CLI-commands.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/UARTCommandConsole.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/main_full.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/BlockQ.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/EventGroupsDemo.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/GenQTest.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/IntQueue.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/IntSemTest.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/QueueOverwrite.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/TaskNotify.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/TimerDemo.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/blocktim.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/countsem.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/death.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/dynamic.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/flop.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/recmutex.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/Standard_Demo_Tasks/semtest.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Full_Demo/FreeRTOS-Plus-CLI/FreeRTOS_CLI.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/FreeRTOS_Source/event_groups.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/FreeRTOS_Source/list.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/FreeRTOS_Source/queue.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/FreeRTOS_Source/stream_buffer.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/FreeRTOS_Source/tasks.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/FreeRTOS_Source/timers.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/FreeRTOS_Source/portable/MemMang/heap_4.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/FreeRTOS_Source/portable/GCC/RX600v2/port.o&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;./src/Blinky_Demo/main_blinky.o&quot;"/>
+								</option>
+								<option id="com.renesas.cdt.managedbuild.gcc.core.option.linker.source.linkOrderUsed.1951377864" name="Use custom linkage order" superClass="com.renesas.cdt.managedbuild.gcc.core.option.linker.source.linkOrderUsed" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.core.option.linker.archives.archiveLibraryFiles.1553319338" name="Standard archive (library) files" superClass="com.renesas.cdt.managedbuild.gcc.core.option.linker.archives.archiveLibraryFiles" useByScannerDiscovery="false" valueType="stringList">
 									<listOptionValue builtIn="false" value="${BuildArtifactFileBaseName}"/>
 									<listOptionValue builtIn="false" value="gcc"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.core.Linker.option.userDefinedOptions.405397077" name="User defined options" superClass="com.renesas.cdt.core.Linker.option.userDefinedOptions" valueType="stringList">
-									<listOptionValue builtIn="false" value="-e_PowerON_Reset"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.core.Linker.option.linkOrderList.436671661" name="" superClass="com.renesas.cdt.core.Linker.option.linkOrderList" valueType="stringList">
-									<listOptionValue builtIn="false" value="&quot;.\libRTOSDemo.a&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_cgc.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_cgc_user.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_cmt.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_cmt_user.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_dbsct.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_hardware_setup.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_icu.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_icu_user.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_intprg.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_main.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_port.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_port_user.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_resetprg.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_s12ad.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_s12ad_user.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_sbrk.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_sci.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_sci_user.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/cg_src\r_cg_vecttbl.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/Renesas_Source\hardware_setup.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/Renesas_Source\interrupt_handlers.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/Renesas_Source\reset_program.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/Renesas_Source\vector_table.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/FreeRTOS_Source/portable/MemMang\heap_4.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/FreeRTOS_Source/portable/GCC/RX600v2\port.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/FreeRTOS_Source\croutine.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/FreeRTOS_Source\event_groups.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/FreeRTOS_Source\list.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/FreeRTOS_Source\queue.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/FreeRTOS_Source\tasks.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/FreeRTOS_Source\timers.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src/Blinky_Demo\main_blinky.o&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;.\src\main.o&quot;"/>
-								</option>
+								<option id="com.renesas.cdt.managedbuild.gcc.core.option.linker.misc.nostdlibs.171804038" name="No startup or default libs (-nostdlib)" superClass="com.renesas.cdt.managedbuild.gcc.core.option.linker.misc.nostdlibs" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+							</tool>
+							<tool id="com.renesas.cdt.managedbuild.gcc.rx.tool.cpp.linker.1547674500" name="Linker CPP" superClass="com.renesas.cdt.managedbuild.gcc.rx.tool.cpp.linker">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.rx.option.linker.cpp.archives.archiveSearchDirectories.1154568468" name="Standard archive search directories" superClass="com.renesas.cdt.managedbuild.gcc.rx.option.linker.cpp.archives.archiveSearchDirectories" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="&quot;${CWD}&quot;"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.core.option.linker.other.userDefinedOptions.1607422988" name="User defined options" superClass="com.renesas.cdt.managedbuild.gcc.core.option.linker.other.userDefinedOptions" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wl,-e_PowerON_Reset"/>
+								</option>
+								<option id="com.renesas.cdt.managedbuild.gcc.core.option.linker.entrypoint.1925604291" name="Entry point:" superClass="com.renesas.cdt.managedbuild.gcc.core.option.linker.entrypoint" useByScannerDiscovery="false" value="" valueType="string"/>
+							</tool>
+							<tool id="com.renesas.cdt.managedbuild.gcc.rx.tool.objcopy.1541956536" name="Objcopy" superClass="com.renesas.cdt.managedbuild.gcc.rx.tool.objcopy"/>
+							<tool id="com.renesas.cdt.managedbuild.gcc.rx.tool.archiver.704557867" name="Archiver" superClass="com.renesas.cdt.managedbuild.gcc.rx.tool.archiver"/>
+							<tool id="com.renesas.cdt.managedbuild.gcc.rx.tool.printsize.1442412314" name="Print Size" superClass="com.renesas.cdt.managedbuild.gcc.rx.tool.printsize">
+								<option id="com.renesas.cdt.managedbuild.gcc.core.option.printsize.format.9970909" name="Size Format" superClass="com.renesas.cdt.managedbuild.gcc.core.option.printsize.format"/>
 							</tool>
-							<tool id="com.renesas.cdt.rx.hardwaredebug.win32.tool.objcopy.Id.1707022669" name="Objcopy" superClass="com.renesas.cdt.rx.hardwaredebug.win32.tool.objcopy.Id"/>
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
@@ -129,15 +176,10 @@
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="RTOSDemo.com.renesas.cdt.rx.projectType.Id.1972787306" name="Executable (Renesas)" projectType="com.renesas.cdt.rx.projectType.Id"/>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<project id="RTOSDemo.com.renesas.cdt.managedbuild.gcc.rx.projectType.Id.1550043240" name="Executable" projectType="com.renesas.cdt.managedbuild.gcc.rx.projectType.Id"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="HardwareDebug">
-			<resource resourceType="PROJECT" workspacePath="/RTOSDemo"/>
-		</configuration>
-	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="scannerConfiguration"/>
 </cproject>
diff --git a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.info b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.info
deleted file mode 100644
index 209c49b604..0000000000
--- a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.info
+++ /dev/null
@@ -1,7 +0,0 @@
-TOOL_CHAIN=KPIT GNURX-ELF Toolchain
-VERSION=v15.01
-TC_INSTALL=C:\Program Files (x86)\KPIT\GNURXv15.01-ELF\rx-elf\rx-elf\
-GCC_STRING=4.8-GNURX_v15.01
-VERSION_IDE=
-E2STUDIO_VERSION=4.0.2.008
-ACTIVE_CONFIGURATION=HardwareDebug
\ No newline at end of file
diff --git a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.project b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.project
index 838b25b979..519bf92325 100644
--- a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.project
+++ b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.project
@@ -6,7 +6,8 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>com.renesas.cdt.core.genmakebuilder</name>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -19,8 +20,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>com.renesas.cdt.core.kpitcnature</nature>
-		<nature>com.renesas.cdt.core.kpitccnature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
diff --git a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.settings/Dependency_Scan_Preferences.prefs b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.settings/Dependency_Scan_Preferences.prefs
deleted file mode 100644
index c52c797ff1..0000000000
--- a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.settings/Dependency_Scan_Preferences.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-Build\ project\ excluding\ the\ dependencies=false
-Re-generate\ and\ use\ dependencies\ during\ project\ build=true
-Use\ existing\ dependencies\ during\ project\ build=false
-eclipse.preferences.version=1
diff --git a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.settings/Project_Generation_Prefrences.prefs b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.settings/Project_Generation_Prefrences.prefs
deleted file mode 100644
index ffd77a7e68..0000000000
--- a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.settings/Project_Generation_Prefrences.prefs
+++ /dev/null
@@ -1,23 +0,0 @@
-Library\ Generator\ Command=rx-elf-libgen
-com.renesas.cdt.core.Assembler.option.includeFileDirectories="${workspace_loc\:/${ProjName}}/src";
-com.renesas.cdt.core.Compiler.option.includeFileDir.1486703917="${TCINSTALL}/rx-elf/optlibinc";
-com.renesas.cdt.core.LibraryGenerator.option.ctype=false
-com.renesas.cdt.core.LibraryGenerator.option.libraryType=Project-Built
-com.renesas.cdt.core.LibraryGenerator.option.math=false
-com.renesas.cdt.core.LibraryGenerator.option.selectLibrary=Optimized
-com.renesas.cdt.core.LibraryGenerator.option.stdio=true
-com.renesas.cdt.core.LibraryGenerator.option.stdlib=true
-com.renesas.cdt.core.LibraryGenerator.option.string=true
-com.renesas.cdt.core.Linker.option.userDefinedOptions=;
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.cpuType=RX700
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.cpuType.855519458=RX700
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.dataEndian=Little-endian data
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.disableFPUInstructions=false
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.genCodeForRX610=false
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.genCodeForRX64M=true
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.generateRXas100output=false
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.macroDefines=__RX_LITTLE_ENDIAN__\=1;
-com.renesas.cdt.rx.HardwareDebug.Compiler.option.make64bitDouble=true
-com.renesas.cdt.rx.HardwareDebug.Linker.option.archiveLibraryFiles=${BuildArtifactFileBaseName};gcc;
-com.renesas.cdt.rx.HardwareDebug.Linker.option.archiveSearchDirectories.883746544="${CONFIGDIR}";"${TCINSTALL}/lib/gcc/rx-elf/${GCC_VERSION}";
-eclipse.preferences.version=1
diff --git a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.settings/language.settings.xml b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.settings/language.settings.xml
index 5ec2264a6f..79c4f29e08 100644
--- a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.settings/language.settings.xml
+++ b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/.settings/language.settings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project>
-	<configuration id="%com.renesas.cdt.rx.hardwaredebug.win32.configuration.Id.363159113" name="HardwareDebug">
+	<configuration id="com.renesas.cdt.managedbuild.gcc.rx.configuration.debug.2055427153" name="HardwareDebug">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-			<provider class="com.renesas.cdt.common.build.spec.RXGCCBuiltinSpecsDetector" console="false" env-hash="-117486239217196327" id="RXGCCBuiltinSpecsDetector" keep-relative-paths="false" name="Renesas GCCBuildinCompilerSettings" options-hash="1142094570" parameter="rx-elf-gcc -E -P -v -dD ${INPUTS}" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1433400315031451836" id="com.renesas.cdt.managedbuild.gcc.rx.ui.languageprovider" keep-relative-paths="false" name="Renesas GCCBuildinCompilerSettings" parameter="${COMMAND} ${toolchain_flags} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/RTOSDemo HardwareDebug.launch b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/RTOSDemo HardwareDebug.launch
index 5594e10057..1b8d643582 100644
--- a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/RTOSDemo HardwareDebug.launch	
+++ b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/RTOSDemo HardwareDebug.launch	
@@ -1,15 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="com.renesas.cdt.launch.dsf.gdbremote.launchConfigurationType">
+<stringAttribute key="com.renesas.cdt.core.additionalServerArgs" value=""/>
 <intAttribute key="com.renesas.cdt.core.admPortNumber" value="61236"/>
 <stringAttribute key="com.renesas.cdt.core.initCommands" value=""/>
 <stringAttribute key="com.renesas.cdt.core.ipAddress" value="localhost"/>
 <stringAttribute key="com.renesas.cdt.core.jtagDevice" value="E1 (RX)"/>
 <stringAttribute key="com.renesas.cdt.core.jtagDeviceId" value="com.renesas.hardwaredebug.rx.e1"/>
+<listAttribute key="com.renesas.cdt.core.listGDBExe">
+<listEntry value="rx-elf-gdb --rx-force-64bit-double  -rx-force-v2"/>
+</listAttribute>
+<listAttribute key="com.renesas.cdt.core.listGDBLaunchName">
+<listEntry value="main"/>
+</listAttribute>
+<listAttribute key="com.renesas.cdt.core.listGDBPort">
+<listEntry value="61234"/>
+</listAttribute>
 <booleanAttribute key="com.renesas.cdt.core.loadImage" value="true"/>
 <stringAttribute key="com.renesas.cdt.core.optionInitCommands" value=""/>
 <intAttribute key="com.renesas.cdt.core.portNumber" value="61234"/>
 <stringAttribute key="com.renesas.cdt.core.runCommands" value=""/>
-<stringAttribute key="com.renesas.cdt.core.serverParam" value="-g E1  -t R5F571ML  -p 61234 -d 61236 -uClockSrcHoco= 0 -uInputClock= 27.0000 -uAllowClockSourceInternal= 1 -uUseFine= 0 -uJTagClockFreq= 16.5 -w 1 -z 0 -uRegisterSetting= 0 -uModePin= 0 -uDebugMode= 0 -uExecuteProgram= 0 -uIdCode= FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -b -n 0 -uWorkRamAddress= 1000 -uProgReWriteIRom= 0 -uProgReWriteDFlash= 0 -uPTimerClock= 120000000 -uhookWorkRamAddr= 0x1000 -uhookWorkRamSize= 0x230"/>
+<booleanAttribute key="com.renesas.cdt.core.secondGDBSupport" value="false"/>
+<stringAttribute key="com.renesas.cdt.core.serverParam" value="-g E1  -t R5F571ML  -uClockSrcHoco= 0 -uInputClock= 27.0000 -uPTimerClock= 120000000 -uAllowClockSourceInternal= 1 -uUseFine= 0 -uJTagClockFreq= 16.5 -w 1 -z 0 -uRegisterSetting= 0 -uModePin= 0 -uChangeStartupBank= 0 -uStartupBank= 0 -uDebugMode= 0 -uExecuteProgram= 0 -uIdCode= FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -uresetOnReload= 1 -n 0 -uWorkRamAddress= 1000 -uProgReWriteIRom= 0 -uProgReWriteDFlash= 0 -uhookWorkRamAddr= 0x1000 -uhookWorkRamSize= 0x230"/>
 <booleanAttribute key="com.renesas.cdt.core.setResume" value="true"/>
 <booleanAttribute key="com.renesas.cdt.core.setStopAt" value="true"/>
 <booleanAttribute key="com.renesas.cdt.core.startServer" value="true"/>
@@ -18,14 +29,15 @@
 <booleanAttribute key="com.renesas.cdt.core.useRemoteTarget" value="true"/>
 <booleanAttribute key="com.renesas.cdt.core.verboseMode" value="false"/>
 <stringAttribute key="com.renesas.cdt.debug.ioview.dsf.registerSelection" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;selectedRegisterList ioFilePath=&quot;C:\DevTools\Renesas\e2_studio_4\internal\IoFiles\RX\RX71M.sfrx&quot;/&gt;&#13;&#10;"/>
-<stringAttribute key="com.renesas.cdt.launch.dsf.IO_MAP" value="${eclipse_home}..\internal\IoFiles\RX\RX71M.sfrx"/>
+<stringAttribute key="com.renesas.cdt.launch.dsf.IO_MAP" value="${support_area_loc}"/>
 <booleanAttribute key="com.renesas.cdt.launch.dsf.USE_DEFAULT_IO_MAP" value="true"/>
 <listAttribute key="com.renesas.cdt.launch.dsf.downloadImages">
 <listEntry value="|true|true|true||true|No core"/>
 </listAttribute>
 <booleanAttribute key="com.renesas.cdt.launch.dsf.downloadImagesUpgradedV30" value="true"/>
 <stringAttribute key="com.renesas.cdt.launch.dsf.launchSeqType" value="com.renesas.cdt.launch.dsf.launchSequence.e2GdbServer"/>
-<stringAttribute key="com.renesas.cdt.launch.dsf.serverPath" value="${eclipse_home}../DebugComp/e2-server-gdb.exe"/>
+<stringAttribute key="com.renesas.cdt.launch.dsf.serverPath" value="${renesas.support.targetLoc:rx-debug}\e2-server-gdb"/>
+<booleanAttribute key="com.renesas.hardwaredebug.e1.allow.change.startup_bank" value="false"/>
 <booleanAttribute key="com.renesas.hardwaredebug.e1.allow.clock.source.internal" value="true"/>
 <intAttribute key="com.renesas.hardwaredebug.e1.clock_source" value="0"/>
 <stringAttribute key="com.renesas.hardwaredebug.e1.connection.mode" value="0"/>
@@ -55,10 +67,13 @@
 <booleanAttribute key="com.renesas.hardwaredebug.e1.prog_rewrite_dflash" value="false"/>
 <booleanAttribute key="com.renesas.hardwaredebug.e1.prog_rewrite_irom" value="false"/>
 <stringAttribute key="com.renesas.hardwaredebug.e1.serial_number" value=""/>
+<stringAttribute key="com.renesas.hardwaredebug.e1.startup_bank" value="0"/>
 <stringAttribute key="com.renesas.hardwaredebug.e1.supply.voltage" value="3.3V"/>
 <intAttribute key="com.renesas.hardwaredebug.e1.timer_clock" value="120000000"/>
 <intAttribute key="com.renesas.hardwaredebug.e1.work_ram_start" value="4096"/>
 <booleanAttribute key="com.renesas.hardwaredebug.e20.le" value="true"/>
+<booleanAttribute key="com.renesas.hardwaredebug.rx.e1.E1DebugToolSettingsTree.resetAfterReload" value="true"/>
+<booleanAttribute key="com.renesas.hardwaredebug.timemeasurement" value="true"/>
 <intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.delay" value="3"/>
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
@@ -79,7 +94,7 @@
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForSymbols" value="false"/>
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForImage" value="true"/>
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForSymbols" value="true"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${eclipse_home}../DebugComp/rx-elf-gdb --rx-force-64bit-double  -rx-force-v2"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="rx-elf-gdb --rx-force-64bit-double  -rx-force-v2"/>
 <booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
 <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
@@ -88,7 +103,7 @@
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="HardwareDebug\RTOSDemo.x"/>
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RTOSDemo"/>
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="%com.renesas.cdt.rx.hardwaredebug.win32.configuration.Id.363159113"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/RTOSDemo"/>
 </listAttribute>
diff --git a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/custom.bat b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/custom.bat
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/makefile.init b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/makefile.init
deleted file mode 100644
index 0835091e23..0000000000
--- a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/makefile.init
+++ /dev/null
@@ -1,5 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-PATH := $(PATH):C:\PROGRA~2\KPIT\GNURXV~1.01-\rx-elf\rx-elf\bin;C:\PROGRA~2\KPIT\GNURXV~1.01-\rx-elf\rx-elf\libexec\gcc\rx-elf\4.8-GNURX_v15.01
\ No newline at end of file
diff --git a/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/src/linker_scriptHardwareDebug.ld b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/src/linker_scriptHardwareDebug.ld
new file mode 100644
index 0000000000..3dd5ef51c3
--- /dev/null
+++ b/FreeRTOS/Demo/RX700_RX71M_RSK_GCC_e2studio_IAR/src/linker_scriptHardwareDebug.ld
@@ -0,0 +1,142 @@
+MEMORY
+{
+	RAM : ORIGIN = 0x0, LENGTH = 524288
+	ROM : ORIGIN = 0xFFC00000, LENGTH = 4194304
+	OFS : ORIGIN = 0x120000, LENGTH = 256
+}
+
+SECTIONS
+{
+	.fvectors 0xFFFFFFFC : AT (0xFFFFFFFC)
+	{
+		KEEP(*(.fvectors))
+	} > ROM
+	.exvectors 0xFFFFFF80 : AT (0xFFFFFF80)
+	{
+		KEEP(*(.exvectors))
+	} > ROM
+	.text 0xFFC00000 : AT (0xFFC00000)
+	{
+		*(.text)
+		*(.text.*)
+		*(P)
+		etext = .;
+	} > ROM
+	.rvectors : 
+	{
+		_rvectors_start = .;
+		KEEP(*(.rvectors))
+		_rvectors_end = .;
+	} > ROM
+	.init : 
+	{
+		*(.init)
+		__preinit_array_start = .;
+		*(.preinit_array)
+		__preinit_array_end = .;
+		__init_array_start = (. + 3) & ~ 3;
+		*(.init_array)
+		*(SORT(.init_array.*))
+		__init_array_end = .;
+		__fini_array_start = .;
+		*(.fini_array)
+		*(SORT(.fini_array.*))
+		__fini_array_end = .;
+	} > ROM
+	.fini : 
+	{
+		*(.fini)
+	} > ROM
+	.got : 
+	{
+		*(.got)
+		*(.got.plt)
+	} > ROM
+	.rodata : 
+	{
+		*(.rodata)
+		*(.rodata.*)
+		*(C_1)
+		*(C_2)
+		*(C)
+		_erodata = .;
+	} > ROM
+	.eh_frame_hdr : 
+	{
+		*(.eh_frame_hdr)
+	} > ROM
+	.eh_frame : 
+	{
+		*(.eh_frame)
+	} > ROM
+	.jcr : 
+	{
+		*(.jcr)
+	} > ROM
+	.tors : 
+	{
+		__CTOR_LIST__ = .;
+		. = ALIGN(2);
+		___ctors = .;
+		*(.ctors)
+		___ctors_end = .;
+		__CTOR_END__ = .;
+		__DTOR_LIST__ = .;
+		___dtors = .;
+		*(.dtors)
+		___dtors_end = .;
+		__DTOR_END__ = .;
+		. = ALIGN(2);
+		_mdata = .;
+	} > ROM
+	.ofs4 0x120060 : AT (0x120060)
+	{
+		KEEP(*(.ofs4))
+	} > OFS
+	.ofs3 0x120050 : AT (0x120050)
+	{
+		KEEP(*(.ofs3))
+	} > OFS
+	.ofs2 0x120048 : AT (0x120048)
+	{
+		KEEP(*(.ofs2))
+	} > OFS
+	.ofs1 0x120040 : AT (0x120040)
+	{
+		KEEP(*(.ofs1))
+	} > OFS
+	.data 0x604 : AT (_mdata)
+	{
+		_data = .;
+		*(.data)
+		*(.data.*)
+		*(D)
+		*(D_1)
+		*(D_2)
+		_edata = .;
+	} > RAM
+	.gcc_exc : 
+	{
+		*(.gcc_exc)
+	} > RAM
+	.bss : 
+	{
+		_bss = .;
+		*(.bss)
+		*(.bss.**)
+		*(COMMON)
+		*(B)
+		*(B_1)
+		*(B_2)
+		_ebss = .;
+		_end = .;
+	} > RAM
+	.ustack 0x600 : AT (0x600)
+	{
+		_ustack = .;
+	} > RAM
+	.istack 0x300 : AT (0x300)
+	{
+		_istack = .;
+	} > RAM
+}