Added c++ linker command to allow to include libstdc++ when linking. #838

helmut64 · 2017-11-16T08:45:11Z

This is needed otherwise the template C++ container support
are missing. The "compiler.c.elf.cmd" specifies the linker,
the C linker was wrong here and does not work for true C++ apps.

This change does not hurt because when no libstdc++ features are
being used there is no change.

Changed the Arduino function map() into Arduino_map(). This is needed
otherwise it clashes with the C++ template class. e.g.: #include

This is needed otherwise the template C++ container support are missing. The "compiler.c.elf.cmd" specifies the linker, the C linker was wrong here and does not work for true C++ apps. This change does not hurt because when no libstdc++ features are being used there is no change. Changed the Arduino function map() into Arduino_map(). This is needed otherwise it clashes with the C++ template class. e.g.: #include <map>

helmut64 · 2017-11-16T08:49:46Z

PS: I also added the same changes into the 32-bit Arduino SAMD release.

me-no-dev · 2017-11-16T08:50:57Z

cores/esp32/Arduino.h

@@ -127,7 +127,7 @@ void loop(void);

 long random(long, long);
 void randomSeed(unsigned long);
-long map(long, long, long, long, long);
+long Arduino_map(long, long, long, long, long);


I'm not sure if this is a good idea at all. Maybe undefine the other map? Arduino users expect this to work this way, so any sketch that uses it will break ;)

The other map is the regular C++ libstdc++ map which is being used in all C++ books, C++ projects, etc.. C++ is now here with this for more than 20 years. It is a fault by Arduino to use this name. It is also little being used compared to the C++ map.

I understand, but this is Arduino framework so it should adhere to the well known Arduino API ;) we can not rename or get rid of this all together.

maybe it can be renamed to Arduino_map and then define map to Arduino_map (which could in turn be later undefined to allow for C++ map)

Arduino uses the gcc compiler and C runtime which brings all the standard runtime libraries. This goes first and than the Arduino libs are on top of it.

sure, but you tell me with this change how will all sketches and examples out there that use Arduino's "map" work?

code needs to do a #undef map before including <map> It is now the same as in the SAMD Version

me-no-dev · 2017-11-16T16:00:06Z

cores/esp32/Arduino.h

@@ -127,7 +127,8 @@ void loop(void);

 long random(long, long);
 void randomSeed(unsigned long);
-long map(long, long, long, long, long);
+long Arduino_map(long, long, long, long, long);
+#define map Arduino_map



I think it's better to define it as map(a,b,c,d,e) so you can per say have class members named map

me-no-dev · 2017-11-16T17:43:50Z

urghh... build breaks... I'll look into this and see what can be done :)

helmut64 · 2017-11-17T11:07:04Z

If I did something wrong please let me know.

me-no-dev · 2017-11-17T14:14:11Z

oh no :) but the define somehow breaks builds and I am not sure yet why. I think that you can click on the details like of the travis ci build and see the errors yourself too. Funny enough, the previous wilder definition did not give any issues.

helmut64 · 2017-11-21T08:35:18Z

I don't know what is wrong with my checkin. Can you help.

helmut64 · 2017-11-26T15:46:35Z

@me-no-dev should I reverse the Arduino_map define to be used without parameters?

me-no-dev · 2017-11-26T22:06:37Z

sorry, i hoped to have some time for this friday, but could not make it. So far IDF compiles it fine.
Will keep you posted :) Have you tried it with gcc?

me-no-dev · 2017-11-26T22:57:12Z

tested :)
the following code compiles fine without any changes (and also g++):

#include <map>
void setup() {
  std::map<char,int> first;
  first['a']=10;
  first['b']=30;
  first['c']=50;
  first['d']=70;
  map(analogRead(34),0,1024,0,100);
}

void loop(){}

helmut64 · 2017-11-27T07:36:19Z

@me-no-dev thank you for testing.
What is the reason that it says here: "All checks have failed"
Thank you for your support.
Helmut

stickbreaker · 2017-11-27T13:18:39Z

@helmut64
I would say it has something to do with:


In file included from /home/travis/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include/c++/5.2.0/map:61:0,

from /home/travis/build/espressif/arduino-esp32/libraries/BLE/src/BLEDevice.h:14,

from /tmp/tmpr1dDVY/src/BLE_scan.ino:6:

/home/travis/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include/c++/5.2.0/bits/stl_map.h:162:11: error: macro "map" requires 5 arguments, but only 1 given

map()

^

/home/travis/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include/c++/5.2.0/bits/stl_map.h:175:48: error: macro "map" requires 5 arguments, but only 2 given

const allocator_type& __a = allocator_type())

^

/home/travis/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include/c++/5.2.0/bits/stl_map.h:185:25: error: macro "map" requires 5 arguments, but only 1 given

map(const map& __x)

^

/home/travis/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include/c++/5.2.0/bits/stl_map.h:196:20: error: macro "map" requires 5 arguments, but only 1 given

map(map&& __x)

^

/home/travis/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include/c++/5.2.0/bits/stl_map.h:213:48: error: macro "map" requires 5 arguments, but only 3 given

const allocator_type& __a = allocator_type())

^

/home/travis/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include/c++/5.2.0/bits/stl_map.h:219:36: error: macro "map" requires 5 arguments, but only 1 given

map(const allocator_type& __a)

^

/home/travis/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include/c++/5.2.0/bits/stl_map.h:223:52: error: macro "map" requires 5 arguments, but only 2 given

map(const map& __m, const allocator_type& __a)

^

/home/travis/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include/c++/5.2.0/bits/stl_map.h:227:47: error: macro "map" requires 5 arguments, but only 2 given

map(map&& __m, const allocator_type& __a)

^

/home/travis/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include/c++/5.2.0/bits/stl_map.h:233:70: error: macro "map" requires 5 arguments, but only 2 given

map(initializer_list<value_type> __l, const allocator_type& __a)

^

/home/travis/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include/c++/5.2.0/bits/stl_map.h:240:31: error: macro "map" requires 5 arguments, but only 3 given

const allocator_type& __a)

chuck.

helmut64 · 2017-11-27T16:01:02Z

@stickbreaker I don't know where the BLE_scan.ino comes from.
In my code using C++ map functions on Arduino I do:
#undef min
#undef max
#undef map
#include
#include
This way I don't use the Arduino map.
In the past I just ad a define map Arduino_map without parameters, that is probably why it was working. But than @me-no-dev recommended to add the parameters. I change it back to my previous version.
Thank you for your feedback.
Regards Helmut

me-no-dev · 2017-11-27T16:10:58Z

@helmut64 you do not need any of those edits to use C++ map ;) I executed the above code WITHOUT applying this PR and it is fine.

helmut64 · 2017-11-27T16:19:00Z

@me-no-dev when don't redefine the map in Arduino.h, I get the following error: (on SAMD and ESP32)
In file included from /var/folders/r6/_hqzqjnd5wjd5pc7f23rms9c0000gn/T/arduino_build_249479/sketch/RadioTest.ino.cpp:1:0:
/Users/helmut/Documents/Arduino/hardware/espressif/esp32/cores/esp32/Arduino.h:129:6: note: candidates are: long int map(long int, long int, long int, long int, long int)
long map(long, long, long, long, long);
^
In file included from /Users/helmut/Documents/Arduino/hardware/espressif/esp32/tools/xtensa-esp32-elf/xtensa-esp32-elf/include/c++/5.2.0/map:61:0,
from /Users/helmut/Documents/Arduino/libraries/RadioShuttle/RadioShuttle.h:30,
from /Volumes/Data/work/mbed-work/STM_MyHome_L4/RadioShuttleLib/examples/RadioTest/RadioTest.ino:10:
/Users/helmut/Documents/Arduino/hardware/espressif/esp32/tools/xtensa-esp32-elf/xtensa-esp32-elf/include/c++/5.2.0/bits/stl_map.h:96:11: note: template<class _Key, class _Tp, class _Compare, class _Alloc> class std::map
class map
^
In file included from /Volumes/Data/work/mbed-work/STM_MyHome_L4/RadioShuttleLib/examples/RadioTest/RadioTest.ino:10:0:
/Users/helmut/Documents/Arduino/libraries/RadioShuttle/RadioShuttle.h:537:5: error: reference to 'map' is ambiguous
map<devid_t, SignalStrengthEntry> _signals;

In file included from /var/folders/r6/_hqzqjnd5wjd5pc7f23rms9c0000gn/T/arduino_build_249479/sketch/RadioTest.ino.cpp:1:0:
/Users/helmut/Documents/Arduino/hardware/espressif/esp32/cores/esp32/Arduino.h:129:6: note: candidates are: long int map(long int, long int, long int, long int, long int)
long map(long, long, long, long, long);
^
In file included from /Users/helmut/Documents/Arduino/hardware/espressif/esp32/tools/xtensa-esp32-elf/xtensa-esp32-elf/include/c++/5.2.0/map:61:0,
from /Users/helmut/Documents/Arduino/libraries/RadioShuttle/RadioShuttle.h:30,
from /Volumes/Data/work/mbed-work/STM_MyHome_L4/RadioShuttleLib/examples/RadioTest/RadioTest.ino:10:
/Users/helmut/Documents/Arduino/hardware/espressif/esp32/tools/xtensa-esp32-elf/xtensa-esp32-elf/include/c++/5.2.0/bits/stl_map.h:96:11: note: template<class _Key, class _Tp, class _Compare, class _Alloc> class std::map
class map
^

me-no-dev · 2017-11-27T16:28:51Z

please show me the code you are compiling.

helmut64 · 2017-11-28T09:11:06Z

@me-no-dev the project is huge, here is an extract of the .h file moved into an simple App.
ArduinoMapTest.zip

me-no-dev · 2017-11-28T09:26:41Z

I changed map to std::map in your sketch and all is fine :)

helmut64 · 2017-11-28T11:33:37Z

@me-no-dev great, I have many more cases in my code and the map problems are only on Arduino, I do now the following after include:
#ifdef ARDUINO
#define map std::map // map clashes with Arduino map()
#endif

Thank you.

In platforms.txt, the compiler.c.elf.cmd=xtensa-esp32-elf-gcc is somehow not right and should be "xtensa-esp32-elf-g++", on the SAMD architecture it does not work without the g++ linker.

Should I continue this patch the the platforms change only, or should we close it because it works.

me-no-dev · 2017-11-28T12:52:47Z

OK, now let's discuss the g++ thing :) Can you show me an example where g++ will make a difference compared to gcc? Not on SAMD but on ESP32 ;)

ESP-IDF also compiles with gcc and AFAIK it should not make any difference.

helmut64 · 2017-11-28T13:17:29Z

The ESP32 Arduino linking works fine and all library C++ container functions are included as exspected. The case can be closed.

FYI: Below is the error I am getting on the samd platform, changing the compiler.c.elf.cmd to g++ is the workaround. Somehow on Arduino ESP32 it works fine even using gcc as a linker.

RadioShuttle/RadioShuttle.cpp.o: In function _M_insert<const RadioShuttle::RadioEntry&>': …/arm-none-eabi-gcc/4.8.3-2014q1/arm-none-eabi/include/c++/4.8.3/bits/stl_list.h:1562: undefined reference to std::__detail::_List_node_base::_M_hook(std::__detail::_List_node_base*)'
RadioShuttle/RadioShuttle.cpp.o: In function std::_Rb_tree_iterator<std::pair<int const, RadioShuttle::AppEntry> >::operator--()': …/arm-none-eabi-gcc/4.8.3-2014q1/arm-none-eabi/include/c++/4.8.3/bits/stl_tree.h:204: undefined reference to std::_Rb_tree_decrement(std::_Rb_tree_node_base*)'
RadioShuttle/RadioShuttle.cpp.o: In function _M_insert_<std::pair<int, RadioShuttle::AppEntry> >': …/arm-none-eabi-gcc/4.8.3-2014q1/arm-none-eabi/include/c++/4.8.3/bits/stl_tree.h:1025: undefined reference to std::_Rb_tree_insert_and_rebalance(bool, std::_Rb_tree_node_base*, std::_Rb_tree_node_base*, std::_Rb_tree_node_base&)'

me-no-dev · 2017-11-28T14:07:03Z

The issues you see are probably connected to the ARM toolchain that you use for compiling :)
Closing this now ;)

helmut64 · 2017-11-28T14:13:21Z

Dear @me-no-dev , thank you for working with me on this. I have to say your support is supior, which everyone can see following the Issues and Poll requests.

Thank you. Helmut (from Hannover Germany)

me-no-dev · 2017-11-28T14:47:35Z

@helmut64 thanks for the good words :) You are very welcome!

me-no-dev reviewed Nov 16, 2017

View reviewed changes

Added old map define which allows old code to compile and C++

dd8914b

code needs to do a #undef map before including <map> It is now the same as in the SAMD Version

me-no-dev reviewed Nov 16, 2017

View reviewed changes

Added parameters to the map re-define

1ab7de3

Removed parameters to avoid build errors

76d4ef8

The renaming of map is not needed for the C++ map by using std::map

c9f3da5

me-no-dev closed this Nov 28, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added c++ linker command to allow to include libstdc++ when linking. #838

Added c++ linker command to allow to include libstdc++ when linking. #838

helmut64 commented Nov 16, 2017

helmut64 commented Nov 16, 2017

me-no-dev Nov 16, 2017

helmut64 Nov 16, 2017

me-no-dev Nov 16, 2017

me-no-dev Nov 16, 2017

helmut64 Nov 16, 2017

me-no-dev Nov 16, 2017

me-no-dev Nov 16, 2017

me-no-dev commented Nov 16, 2017

helmut64 commented Nov 17, 2017

me-no-dev commented Nov 17, 2017

helmut64 commented Nov 21, 2017

helmut64 commented Nov 26, 2017

me-no-dev commented Nov 26, 2017

me-no-dev commented Nov 26, 2017

helmut64 commented Nov 27, 2017

stickbreaker commented Nov 27, 2017

helmut64 commented Nov 27, 2017

me-no-dev commented Nov 27, 2017

helmut64 commented Nov 27, 2017 •

edited

Loading

me-no-dev commented Nov 27, 2017

helmut64 commented Nov 28, 2017

me-no-dev commented Nov 28, 2017

helmut64 commented Nov 28, 2017

me-no-dev commented Nov 28, 2017

helmut64 commented Nov 28, 2017

me-no-dev commented Nov 28, 2017

helmut64 commented Nov 28, 2017

me-no-dev commented Nov 28, 2017

Added c++ linker command to allow to include libstdc++ when linking. #838

Added c++ linker command to allow to include libstdc++ when linking. #838

Conversation

helmut64 commented Nov 16, 2017

helmut64 commented Nov 16, 2017

me-no-dev Nov 16, 2017

Choose a reason for hiding this comment

helmut64 Nov 16, 2017

Choose a reason for hiding this comment

me-no-dev Nov 16, 2017

Choose a reason for hiding this comment

me-no-dev Nov 16, 2017

Choose a reason for hiding this comment

helmut64 Nov 16, 2017

Choose a reason for hiding this comment

me-no-dev Nov 16, 2017

Choose a reason for hiding this comment

me-no-dev Nov 16, 2017

Choose a reason for hiding this comment

me-no-dev commented Nov 16, 2017

helmut64 commented Nov 17, 2017

me-no-dev commented Nov 17, 2017

helmut64 commented Nov 21, 2017

helmut64 commented Nov 26, 2017

me-no-dev commented Nov 26, 2017

me-no-dev commented Nov 26, 2017

helmut64 commented Nov 27, 2017

stickbreaker commented Nov 27, 2017

helmut64 commented Nov 27, 2017

me-no-dev commented Nov 27, 2017

helmut64 commented Nov 27, 2017 • edited Loading

me-no-dev commented Nov 27, 2017

helmut64 commented Nov 28, 2017

me-no-dev commented Nov 28, 2017

helmut64 commented Nov 28, 2017

me-no-dev commented Nov 28, 2017

helmut64 commented Nov 28, 2017

me-no-dev commented Nov 28, 2017

helmut64 commented Nov 28, 2017

me-no-dev commented Nov 28, 2017

helmut64 commented Nov 27, 2017 •

edited

Loading