Merge pull request #3168 from armink/fix_eclipse

Fix eclipse

bsp/stm32/stm32f103-dofly-M3S/.cproject

@@ -79,7 +79,6 @@
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
                   <listOptionValue builtIn="false" value="DEBUG" />
-                  <listOptionValue builtIn="false" value="_REENT_SMALL" />
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other.2133065240" name="Other compiler flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other" useByScannerDiscovery="true" value="" valueType="string" />
                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files.714348818" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files" useByScannerDiscovery="true" valueType="includeFiles">

bsp/stm32/stm32f103-yf-ufun/.cproject

@@ -78,7 +78,6 @@
                 </option>
                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
                   <listOptionValue builtIn="false" value="DEBUG" />
-                  <listOptionValue builtIn="false" value="_REENT_SMALL" />
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other.2133065240" name="Other compiler flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other" useByScannerDiscovery="true" value="" valueType="string" />
                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files.714348818" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files" useByScannerDiscovery="true" valueType="includeFiles">

bsp/stm32/stm32f401-st-nucleo/.cproject

@@ -80,7 +80,6 @@
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
                   <listOptionValue builtIn="false" value="DEBUG" />
-                  <listOptionValue builtIn="false" value="_REENT_SMALL" />
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other.2133065240" name="Other compiler flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other" useByScannerDiscovery="true" value="" valueType="string" />
                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files.714348818" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files" useByScannerDiscovery="true" valueType="includeFiles">

bsp/stm32/stm32f405-smdz-breadfruit/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+  <name>stm32f405-smdz-breadfruit</name>
+  <comment />
+  <projects>
+	</projects>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+      <triggers>clean,full,incremental,</triggers>
+      <arguments>
+			</arguments>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+      <triggers>full,incremental,</triggers>
+      <arguments>
+			</arguments>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.cdt.core.cnature</nature>
+    <nature>org.rt-thread.studio.rttnature</nature>
+    <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+    <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+  </natures>
+  <linkedResources>
+    <link>
+      <name>rt-thread</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>rt-thread/bsp</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>rt-thread/components</name>
+      <type>2</type>
+      <locationURI>$%7BPARENT-3-PROJECT_LOC%7D/components</locationURI>
+    </link>
+    <link>
+      <name>rt-thread/include</name>
+      <type>2</type>
+      <locationURI>$%7BPARENT-3-PROJECT_LOC%7D/include</locationURI>
+    </link>
+    <link>
+      <name>rt-thread/libcpu</name>
+      <type>2</type>
+      <locationURI>$%7BPARENT-3-PROJECT_LOC%7D/libcpu</locationURI>
+    </link>
+    <link>
+      <name>rt-thread/src</name>
+      <type>2</type>
+      <locationURI>$%7BPARENT-3-PROJECT_LOC%7D/src</locationURI>
+    </link>
+    <link>
+      <name>rt-thread/bsp/stm32</name>
+      <type>2</type>
+      <locationURI>virtual:/virtual</locationURI>
+    </link>
+    <link>
+      <name>rt-thread/bsp/stm32/libraries</name>
+      <type>2</type>
+      <locationURI>$%7BPARENT-1-PROJECT_LOC%7D/libraries</locationURI>
+    </link>
+  </linkedResources>
+</projectDescription>

bsp/stm32/stm32f405-smdz-breadfruit/.settings/language.settings.xml

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<configuration id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.553091094" name="Debug">
+		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
+			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1576159572023439102" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_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>
+		</extension>
+	</configuration>
+</project>

bsp/stm32/stm32f405-smdz-breadfruit/.settings/org.eclipse.core.runtime.prefs

+content-types/enabled=true
+content-types/org.eclipse.cdt.core.asmSource/file-extensions=s
+eclipse.preferences.version=1

bsp/stm32/stm32f405-smdz-breadfruit/makefile.targets

+clean2:
+	-$(RM) $(CC_DEPS)$(C++_DEPS)$(C_UPPER_DEPS)$(CXX_DEPS)$(SECONDARY_FLASH)$(SECONDARY_SIZE)$(ASM_DEPS)$(S_UPPER_DEPS)$(C_DEPS)$(CPP_DEPS)
+	-$(RM) $(OBJS) *.elf
+	-@echo ' '
\ No newline at end of file

bsp/stm32/stm32f407-atk-explorer/.cproject

@@ -81,7 +81,6 @@
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
                   <listOptionValue builtIn="false" value="DEBUG" />
-                  <listOptionValue builtIn="false" value="_REENT_SMALL" />
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other.2133065240" name="Other compiler flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other" useByScannerDiscovery="true" value="" valueType="string" />
                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files.714348818" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files" useByScannerDiscovery="true" valueType="includeFiles">

bsp/stm32/stm32f411-st-nucleo/.cproject

@@ -80,7 +80,6 @@
                 </option>
                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
                   <listOptionValue builtIn="false" value="DEBUG" />
-                  <listOptionValue builtIn="false" value="_REENT_SMALL" />
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other.2133065240" name="Other compiler flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other" useByScannerDiscovery="true" value="" valueType="string" />
                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files.714348818" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files" useByScannerDiscovery="true" valueType="includeFiles">

bsp/stm32/stm32f429-atk-apollo/.cproject

@@ -81,7 +81,6 @@
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
                   <listOptionValue builtIn="false" value="DEBUG" />
-                  <listOptionValue builtIn="false" value="_REENT_SMALL" />
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other.2133065240" name="Other compiler flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other" useByScannerDiscovery="true" value="" valueType="string" />
                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files.714348818" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files" useByScannerDiscovery="true" valueType="includeFiles">

bsp/stm32/stm32f429-fire-challenger/.cproject

@@ -81,7 +81,6 @@
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
                   <listOptionValue builtIn="false" value="DEBUG" />
-                  <listOptionValue builtIn="false" value="_REENT_SMALL" />
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other.2133065240" name="Other compiler flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other" useByScannerDiscovery="true" value="" valueType="string" />
                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files.714348818" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files" useByScannerDiscovery="true" valueType="includeFiles">

bsp/stm32/stm32f767-atk-apollo/.cproject

@@ -81,7 +81,6 @@
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
                   <listOptionValue builtIn="false" value="DEBUG" />
-                  <listOptionValue builtIn="false" value="_REENT_SMALL" />
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other.2133065240" name="Other compiler flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other" useByScannerDiscovery="true" value="" valueType="string" />
                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files.714348818" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files" useByScannerDiscovery="true" valueType="includeFiles">

bsp/stm32/stm32l475-atk-pandora/.cproject

@@ -80,7 +80,6 @@
                 </option>
                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
                   <listOptionValue builtIn="false" value="DEBUG" />
-                  <listOptionValue builtIn="false" value="_REENT_SMALL" />
                 </option>
                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other.2133065240" name="Other compiler flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.other" useByScannerDiscovery="true" value="" valueType="string" />
                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files.714348818" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files" useByScannerDiscovery="true" valueType="includeFiles">

tools/eclipse.py

@@ -142,23 +142,49 @@ def HandleToolOption(tools, env, project, reset):
     CPPDEFINES = project['CPPDEFINES']
     paths = [ConverToRttEclipsePathFormat(RelativeProjectPath(env, os.path.normpath(i)).replace('\\', '/')) for i in project['CPPPATH']]
 
+    compile_include_paths_option = None
+    compile_include_files_option = None
+    compile_defs_option = None
+    linker_scriptfile_option = None
+    linker_script_option = None
+    linker_nostart_option = None
+    linker_libs_option = None
+    linker_paths_option = None
+    linker_newlib_nano_option = None
+
     for tool in tools:
+
         if tool.get('id').find('c.compile') != 1:
             options = tool.findall('option')
-            include_paths_option = None
-            include_files_option = None
-            defs_option = None
             # find all compile options
             for option in options:
                 if option.get('id').find('c.compiler.include.paths') != -1 or option.get('id').find('c.compiler.option.includepaths') != -1:
-                    include_paths_option = option
+                    compile_include_paths_option = option
                 elif option.get('id').find('c.compiler.include.files') != -1 or option.get('id').find('c.compiler.option.includefiles') != -1 :
-                    include_files_option = option
+                    compile_include_files_option = option
                 elif option.get('id').find('c.compiler.defs') != -1 or option.get('id').find('c.compiler.option.definedsymbols') != -1:
-                    defs_option = option
+                    compile_defs_option = option
+
+        if tool.get('id').find('c.linker') != -1:
+            options = tool.findall('option')
+            # find all linker options
+            for option in options:
+                if option.get('id').find('c.linker.scriptfile') != -1:
+                    linker_scriptfile_option = option
+                elif option.get('id').find('c.linker.option.script') != -1:
+                    linker_script_option = option
+                elif option.get('id').find('c.linker.nostart') != -1:
+                    linker_nostart_option = option
+                elif option.get('id').find('c.linker.libs') != -1 and env.has_key('LIBS'):
+                    linker_libs_option = option
+                elif option.get('id').find('c.linker.paths') != -1 and env.has_key('LIBPATH'):
+                    linker_paths_option = option
+                elif option.get('id').find('c.linker.usenewlibnano') != -1:
+                    linker_newlib_nano_option = option
+
     # change the inclue path
-            if include_paths_option is not None :
-                option = include_paths_option
+    if compile_include_paths_option is not None :
+        option = compile_include_paths_option
         # find all of paths in this project
         include_paths = option.findall('listOptionValue')
         for item in include_paths:
@@ -170,8 +196,12 @@ def HandleToolOption(tools, env, project, reset):
         for item in paths:
             SubElement(option, 'listOptionValue', {'builtIn': 'false', 'value': item})
     # change the inclue files (default) or definitions
-            if include_files_option is not None:
-                option = include_files_option
+    if compile_include_files_option is not None:
+        option = compile_include_files_option
+        # add '_REENT_SMALL' to CPPDEFINES when --specs=nano.specs has select
+        if linker_newlib_nano_option is not None and linker_newlib_nano_option.get('value') == 'true' and '_REENT_SMALL' not in CPPDEFINES:
+            CPPDEFINES += ['_REENT_SMALL']
+
         file_header = '''
 #ifndef RTCONFIG_PREINC_H__
 #define RTCONFIG_PREINC_H__
@@ -197,8 +227,8 @@ def HandleToolOption(tools, env, project, reset):
                 break
         if find_ok is False:
             SubElement(option, 'listOptionValue', {'builtIn': 'false', 'value': rtt_pre_inc_item})
-            elif defs_option is not None :
-                option = defs_option
+    elif compile_defs_option is not None :
+        option = compile_defs_option
         defs = option.findall('listOptionValue')
         project_defs = []
         for item in defs:
@@ -217,11 +247,9 @@ def HandleToolOption(tools, env, project, reset):
         for item in cproject_defs:
             SubElement(option, 'listOptionValue', {'builtIn': 'false', 'value': item})
 
-        if tool.get('id').find('c.linker') != -1:
-            options = tool.findall('option')
-            for option in options:
     # update linker script config
-                if option.get('id').find('c.linker.scriptfile') != -1:
+    if linker_scriptfile_option is not None :
+        option = linker_scriptfile_option
         linker_script = 'link.lds'
         items = env['LINKFLAGS'].split(' ')
         if '-T' in items:
@@ -233,32 +261,32 @@ def HandleToolOption(tools, env, project, reset):
             listOptionValue.set('value', linker_script)
         else:
             SubElement(option, 'listOptionValue', {'builtIn': 'false', 'value': linker_script})
-
     # scriptfile in stm32cubeIDE
-                if option.get('id').find('c.linker.option.script') != -1:
+    if linker_script_option is not None :
+        option = linker_script_option
         items = env['LINKFLAGS'].split(' ')
         if '-T' in items:
             linker_script = ConverToRttEclipsePathFormat(items[items.index('-T') + 1]).strip('"')
-                        option.set('value',linker_script)
-
+            option.set('value', linker_script)
     # update nostartfiles config
-                if option.get('id').find('c.linker.nostart') != -1:
+    if linker_nostart_option is not None :
+        option = linker_nostart_option
         if env['LINKFLAGS'].find('-nostartfiles') != -1:
             option.set('value', 'true')
         else:
             option.set('value', 'false')
-
     # update libs
-                if option.get('id').find('c.linker.libs') != -1 and env.has_key('LIBS'):
+    if linker_libs_option is not None :
+        option = linker_libs_option
         # remove old libs
         for item in option.findall('listOptionValue'):
             option.remove(item)
         # add new libs
         for lib in env['LIBS']:
             SubElement(option, 'listOptionValue', {'builtIn': 'false', 'value': lib})
-
     # update lib paths
-                if option.get('id').find('c.linker.paths') != -1 and env.has_key('LIBPATH'):
+    if linker_paths_option is not None :
+        option = linker_paths_option
         # remove old lib paths
         for item in option.findall('listOptionValue'):
             option.remove(item)