Skip to content

Add C++ language standard menu item #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

Add C++ language standard menu item #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
92a1803
Expose the language standard via the gui
DrItanium Jan 25, 2021
51c149d
1284 clock settings
DrItanium Jan 25, 2021
aa59ea2
Language standard mode for 644, 324, and 164 as well
DrItanium Jan 25, 2021
111269a
Remove the extra frequency groups
DrItanium Jan 26, 2021
71d631f
Bind language standard to a separate variable
DrItanium Jan 26, 2021
894fbd4
Default to gnu++17
DrItanium Feb 24, 2021
0cc17fc
Merge branch 'master' into master_sync
DrItanium Apr 18, 2021
0587c2a
import C++14 additional delete operators
DrItanium Apr 18, 2021
bf7e733
Whoops it is size_t not std::size_t...
DrItanium Apr 18, 2021
eaf051d
It's size_t not std::size_t...
DrItanium Apr 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions avr/boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ menu.LTO=Compiler LTO
menu.variant=Variant
menu.pinout=Pinout
menu.bootloader=Bootloader
menu.CppLanguageStandard=C++ Language Standard


######################
Expand Down Expand Up @@ -241,6 +242,20 @@ menu.bootloader=Bootloader
1284.menu.clock.1MHz_internal.build.f_cpu=1000000L


# C++ Language Standard
1284.menu.CppLanguageStandard.Default=Default

1284.menu.CppLanguageStandard.Cpp11=C++11
1284.menu.CppLanguageStandard.Cpp11.compiler.cpp.languageStandard=-std=gnu++11

1284.menu.CppLanguageStandard.Cpp14=C++14
1284.menu.CppLanguageStandard.Cpp14.compiler.cpp.languageStandard=-std=gnu++14

1284.menu.CppLanguageStandard.Cpp17=C++17
1284.menu.CppLanguageStandard.Cpp17.compiler.cpp.languageStandard=-std=gnu++17




###########################
#### ATmega644/A/P/PA ####
Expand Down Expand Up @@ -446,6 +461,19 @@ menu.bootloader=Bootloader
644.menu.clock.1MHz_internal.build.clock_speed={build.f_cpu}
644.menu.clock.1MHz_internal.build.f_cpu=1000000L

# C++ Language Standard
644.menu.CppLanguageStandard.Default=Default
644.menu.CppLanguageStandard.Default.compiler.cpp.extra_flags=

644.menu.CppLanguageStandard.Cpp11=C++11
644.menu.CppLanguageStandard.Cpp11.compiler.cpp.extra_flags=-std=gnu++11

644.menu.CppLanguageStandard.Cpp14=C++14
644.menu.CppLanguageStandard.Cpp14.compiler.cpp.extra_flags=-std=gnu++14

644.menu.CppLanguageStandard.Cpp17=C++17
644.menu.CppLanguageStandard.Cpp17.compiler.cpp.extra_flags=-std=gnu++17



##########################
Expand Down Expand Up @@ -672,6 +700,19 @@ menu.bootloader=Bootloader
324.menu.clock.1MHz_internal.build.clock_speed={build.f_cpu}
324.menu.clock.1MHz_internal.build.f_cpu=1000000L

# C++ Language Standard
324.menu.CppLanguageStandard.Default=Default
324.menu.CppLanguageStandard.Default.compiler.cpp.extra_flags=

324.menu.CppLanguageStandard.Cpp11=C++11
324.menu.CppLanguageStandard.Cpp11.compiler.cpp.extra_flags=-std=gnu++11

324.menu.CppLanguageStandard.Cpp14=C++14
324.menu.CppLanguageStandard.Cpp14.compiler.cpp.extra_flags=-std=gnu++14

324.menu.CppLanguageStandard.Cpp17=C++17
324.menu.CppLanguageStandard.Cpp17.compiler.cpp.extra_flags=-std=gnu++17



##########################
Expand Down Expand Up @@ -878,6 +919,19 @@ menu.bootloader=Bootloader
164.menu.clock.1MHz_internal.build.clock_speed={build.f_cpu}
164.menu.clock.1MHz_internal.build.f_cpu=1000000L

# C++ Language Standard
164.menu.CppLanguageStandard.Default=Default
164.menu.CppLanguageStandard.Default.compiler.cpp.extra_flags=

164.menu.CppLanguageStandard.Cpp11=C++11
164.menu.CppLanguageStandard.Cpp11.compiler.cpp.extra_flags=-std=gnu++11

164.menu.CppLanguageStandard.Cpp14=C++14
164.menu.CppLanguageStandard.Cpp14.compiler.cpp.extra_flags=-std=gnu++14

164.menu.CppLanguageStandard.Cpp17=C++17
164.menu.CppLanguageStandard.Cpp17.compiler.cpp.extra_flags=-std=gnu++17



#####################
Expand Down Expand Up @@ -1053,6 +1107,19 @@ menu.bootloader=Bootloader
32.menu.clock.1MHz_internal.bootloader.ckopt_bit=1
32.menu.clock.1MHz_internal.build.f_cpu=1000000L

# C++ Language Standard
32.menu.CppLanguageStandard.Default=Default
32.menu.CppLanguageStandard.Default.compiler.cpp.extra_flags=

32.menu.CppLanguageStandard.Cpp11=C++11
32.menu.CppLanguageStandard.Cpp11.compiler.cpp.extra_flags=-std=gnu++11

32.menu.CppLanguageStandard.Cpp14=C++14
32.menu.CppLanguageStandard.Cpp14.compiler.cpp.extra_flags=-std=gnu++14

32.menu.CppLanguageStandard.Cpp17=C++17
32.menu.CppLanguageStandard.Cpp17.compiler.cpp.extra_flags=-std=gnu++17



#####################
Expand Down Expand Up @@ -1228,6 +1295,19 @@ menu.bootloader=Bootloader
16.menu.clock.1MHz_internal.bootloader.ckopt_bit=1
16.menu.clock.1MHz_internal.build.f_cpu=1000000L

# C++ Language Standard
16.menu.CppLanguageStandard.Default=Default
16.menu.CppLanguageStandard.Default.compiler.cpp.extra_flags=

16.menu.CppLanguageStandard.Cpp11=C++11
16.menu.CppLanguageStandard.Cpp11.compiler.cpp.extra_flags=-std=gnu++11

16.menu.CppLanguageStandard.Cpp14=C++14
16.menu.CppLanguageStandard.Cpp14.compiler.cpp.extra_flags=-std=gnu++14

16.menu.CppLanguageStandard.Cpp17=C++17
16.menu.CppLanguageStandard.Cpp17.compiler.cpp.extra_flags=-std=gnu++17



#####################
Expand Down Expand Up @@ -1402,3 +1482,16 @@ menu.bootloader=Bootloader
8535.menu.clock.1MHz_internal.bootloader.sut_cksel_bits=100001
8535.menu.clock.1MHz_internal.bootloader.ckopt_bit=1
8535.menu.clock.1MHz_internal.build.f_cpu=1000000L

# C++ Language Standard
8535.menu.CppLanguageStandard.Default=Default
8535.menu.CppLanguageStandard.Default.compiler.cpp.extra_flags=

8535.menu.CppLanguageStandard.Cpp11=C++11
8535.menu.CppLanguageStandard.Cpp11.compiler.cpp.extra_flags=-std=gnu++11

8535.menu.CppLanguageStandard.Cpp14=C++14
8535.menu.CppLanguageStandard.Cpp14.compiler.cpp.extra_flags=-std=gnu++14

8535.menu.CppLanguageStandard.Cpp17=C++17
8535.menu.CppLanguageStandard.Cpp17.compiler.cpp.extra_flags=-std=gnu++17
15 changes: 15 additions & 0 deletions avr/cores/MCUdude_corefiles/new.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,18 @@ void operator delete[](void * ptr) {
free(ptr);
}

// C++14 introduces additional delete operators
#if __cplusplus >= 201402L

void operator delete(void * ptr, size_t)
{
::operator delete(ptr);
}

void operator delete[](void * ptr, size_t)
{
::operator delete(ptr);
}

#endif // end language is C++14 or greater

6 changes: 6 additions & 0 deletions avr/cores/MCUdude_corefiles/new.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,11 @@ void * operator new[](size_t size);
void operator delete(void * ptr);
void operator delete[](void * ptr);

// C++14 introduces additional delete operators
#if __cplusplus >= 201402L
void operator delete(void * ptr, size_t);
void operator delete[](void * ptr, size_t);
#endif // end language is C++14 or greater

#endif

7 changes: 5 additions & 2 deletions avr/platform.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,18 @@ compiler.warning_flags.default=
compiler.warning_flags.more=-Wall
compiler.warning_flags.all=-Wall -Wextra

compiler.c.languageStandard=-std=gnu11
compiler.cpp.languageStandard=-std=gnu++17

# Default "compiler.path" is correct, change only if you want to overidde the initial value
compiler.path={runtime.tools.avr-gcc.path}/bin/
compiler.c.cmd=avr-gcc
compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD
compiler.c.flags=-c -g -Os {compiler.warning_flags} {compiler.c.languageStandard} -ffunction-sections -fdata-sections -MMD
compiler.c.elf.flags={compiler.warning_flags} -Os -Wl,--gc-sections,--section-start=.FAR_MEM1=0x10000
compiler.c.elf.cmd=avr-gcc
compiler.S.flags=-c -g -x assembler-with-cpp
compiler.cpp.cmd=avr-g++
compiler.cpp.flags=-c -g -Os {compiler.warning_flags} -std=gnu++11 -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD
compiler.cpp.flags=-c -g -Os {compiler.warning_flags} {compiler.cpp.languageStandard} -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD
compiler.ar.cmd={ltoarcmd}
compiler.ar.flags=rcs
compiler.objcopy.cmd=avr-objcopy
Expand Down