From eb828f3807ca9f1e8073c547de01826284b81eaa Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Wed, 3 Mar 2021 15:39:02 +0100 Subject: [PATCH] use C++11 whereever possible --- configure/os/CONFIG.Common.SL6-x86_64 | 3 +++ configure/os/CONFIG.Common.eldk42-ppc4xxFP | 3 +++ configure/os/CONFIG.Common.eldk51-ppc4xxSF | 3 +++ configure/os/CONFIG.Common.eldk52-e500v2 | 3 +++ configure/os/CONFIG.Common.moxa42-armv6l | 3 +++ configure/os/CONFIG.Common.mvl40-xscale_be | 3 +++ configure/os/CONFIG_SITE.Common.linuxCommon | 10 ++-------- 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/configure/os/CONFIG.Common.SL6-x86_64 b/configure/os/CONFIG.Common.SL6-x86_64 index 757bcb323..a0c6604bc 100644 --- a/configure/os/CONFIG.Common.SL6-x86_64 +++ b/configure/os/CONFIG.Common.SL6-x86_64 @@ -1,2 +1,5 @@ # Include definitions common to linux pentium targets include $(CONFIG)/os/CONFIG.Common.linux-x86_64 + +# have no full C++11 +STD_CXXFLAGS = -std=c++0x diff --git a/configure/os/CONFIG.Common.eldk42-ppc4xxFP b/configure/os/CONFIG.Common.eldk42-ppc4xxFP index 716a29931..59ab89071 100644 --- a/configure/os/CONFIG.Common.eldk42-ppc4xxFP +++ b/configure/os/CONFIG.Common.eldk42-ppc4xxFP @@ -20,3 +20,6 @@ ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/lib ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib + +# have no C++11 +STD_CXXFLAGS = diff --git a/configure/os/CONFIG.Common.eldk51-ppc4xxSF b/configure/os/CONFIG.Common.eldk51-ppc4xxSF index 48b3e7e3b..d082030d2 100644 --- a/configure/os/CONFIG.Common.eldk51-ppc4xxSF +++ b/configure/os/CONFIG.Common.eldk51-ppc4xxSF @@ -12,3 +12,6 @@ GNU_TARGET = powerpc-4xx-softfloat GNU_ARCH = ppc405-linux GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH) + +# have no full C++11 +STD_CXXFLAGS = -std=c++0x diff --git a/configure/os/CONFIG.Common.eldk52-e500v2 b/configure/os/CONFIG.Common.eldk52-e500v2 index ff1d5ffd6..be9799ed7 100644 --- a/configure/os/CONFIG.Common.eldk52-e500v2 +++ b/configure/os/CONFIG.Common.eldk52-e500v2 @@ -13,3 +13,6 @@ GNU_ARCH = ppce500v2-linux-gnuspe GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH) GNU_TARGET_INCLUDE_DIR = + +# have no full C++11 +STD_CXXFLAGS = -std=c++0x diff --git a/configure/os/CONFIG.Common.moxa42-armv6l b/configure/os/CONFIG.Common.moxa42-armv6l index eecdcc7c1..9c8ceb7fd 100644 --- a/configure/os/CONFIG.Common.moxa42-armv6l +++ b/configure/os/CONFIG.Common.moxa42-armv6l @@ -14,3 +14,6 @@ COMMANDLINE_LIBRARY = READLINE_NCURSES ARCH_DEP_CXXFLAGS += -Wno-psabi ARCH_DEP_CFLAGS += -funwind-tables + +# have no full C++11 +STD_CXXFLAGS = -std=c++0x diff --git a/configure/os/CONFIG.Common.mvl40-xscale_be b/configure/os/CONFIG.Common.mvl40-xscale_be index a2a703314..77748202d 100644 --- a/configure/os/CONFIG.Common.mvl40-xscale_be +++ b/configure/os/CONFIG.Common.mvl40-xscale_be @@ -11,5 +11,8 @@ GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/xscale_be/armv5teb-montavista-lin ARCH_DEP_CFLAGS += -funwind-tables +# have no C++11 +STD_CXXFLAGS = + # Cannot build PVA because of missing boost support SKIP_BUILDS = pv% normativeTypes diff --git a/configure/os/CONFIG_SITE.Common.linuxCommon b/configure/os/CONFIG_SITE.Common.linuxCommon index f379a4577..f77bbaf48 100644 --- a/configure/os/CONFIG_SITE.Common.linuxCommon +++ b/configure/os/CONFIG_SITE.Common.linuxCommon @@ -8,13 +8,7 @@ # They must be set in the host+target specific file instead: # CONFIG_SITE.. -# PSI: -# It makes sense to include debugging symbols even in optimized builds -# in case you want to attach gdb to the process or examine a core-dump. -# This does cost disk space, but not memory as debug symbols are not -# loaded into RAM when the binary is loaded. -OPT_CFLAGS_YES += -g -OPT_CXXFLAGS_YES += -g - COMMANDLINE_LIBRARY = READLINE CODE_CPPFLAGS += -fno-strict-aliasing +USR_CXXFLAGS += $(STD_CXXFLAGS) +STD_CXXFLAGS = -std=c++11