From 1f0cdacc9731299b7c6055f8c1a077070a252d1d Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 11 Nov 2024 16:57:17 +0100 Subject: [PATCH 1/7] Removed check for c++14, not supported anymore * ACE/include/makeinclude/platform_linux_clang.GNU: --- ACE/include/makeinclude/platform_linux_clang.GNU | 2 -- 1 file changed, 2 deletions(-) diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU index 2f251d0858675..093aee00bff52 100644 --- a/ACE/include/makeinclude/platform_linux_clang.GNU +++ b/ACE/include/makeinclude/platform_linux_clang.GNU @@ -47,8 +47,6 @@ else ifeq ($(c++20),1) CCFLAGS += -std=c++20 else ifeq ($(c++17),1) CCFLAGS += -std=c++17 -else ifeq ($(c++14),1) - CCFLAGS += -std=c++14 endif ifeq ($(no_deprecated),1) From 94a462be6052789f5fbe86a7361816d8c4393f9a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 11 Nov 2024 16:57:35 +0100 Subject: [PATCH 2/7] Removed check for c++14, not supported anymore * ACE/include/makeinclude/platform_gcc_clang_common.GNU: --- ACE/include/makeinclude/platform_gcc_clang_common.GNU | 2 -- 1 file changed, 2 deletions(-) diff --git a/ACE/include/makeinclude/platform_gcc_clang_common.GNU b/ACE/include/makeinclude/platform_gcc_clang_common.GNU index 214da114ec62a..62c9dc23bf3fd 100644 --- a/ACE/include/makeinclude/platform_gcc_clang_common.GNU +++ b/ACE/include/makeinclude/platform_gcc_clang_common.GNU @@ -55,8 +55,6 @@ else ifeq ($(c++20),1) CCFLAGS += -std=c++20 else ifeq ($(c++17),1) CCFLAGS += -std=c++17 -else ifeq ($(c++14),1) - CCFLAGS += -std=c++14 endif # If no option has been specified, set templates to automatic From 3fbd1869845f9f774351a56672eb0109509a904e Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 11 Nov 2024 16:57:55 +0100 Subject: [PATCH 3/7] Removed ancient check for gcc 4.0.2 * ACE/include/makeinclude/platform_linux.GNU: --- ACE/include/makeinclude/platform_linux.GNU | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU index 466fb28661369..57f1aa6a504ed 100644 --- a/ACE/include/makeinclude/platform_linux.GNU +++ b/ACE/include/makeinclude/platform_linux.GNU @@ -52,15 +52,8 @@ endif # include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU -# TAO with GCC 4.0.2 and -O3 seems to result in runtime issues, for example -# the ForwardRequest PI test will fail. For GCC 4.0.2 we default to -O2 -ifeq ($(CXX_VERSION),4.0.2) - OCFLAGS ?= -O2 - OCCFLAGS ?=-O2 -else - OCFLAGS ?= -O3 - OCCFLAGS ?= -O3 -endif +OCFLAGS ?= -O3 +OCCFLAGS ?= -O3 #### GNU gas has a string limit of 4096 characters. On Alphas, #### builds will fail due to running over that limit. There are From 35c33fc8720653fae641a2ef07470837104f5b8b Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 12 Nov 2024 10:46:05 +0100 Subject: [PATCH 4/7] Removed empty line * ACE/include/makeinclude/platform_clang_common.GNU: --- ACE/include/makeinclude/platform_clang_common.GNU | 1 - 1 file changed, 1 deletion(-) diff --git a/ACE/include/makeinclude/platform_clang_common.GNU b/ACE/include/makeinclude/platform_clang_common.GNU index 667d394e1da0e..0f53f913a3951 100644 --- a/ACE/include/makeinclude/platform_clang_common.GNU +++ b/ACE/include/makeinclude/platform_clang_common.GNU @@ -30,7 +30,6 @@ else endif CXX_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion) - CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version) # Only modify LDFLAGS if DLD has been set. From 1b0fa02eb7e03a308eb3692882a26abe08fbd5e1 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 12 Nov 2024 12:49:05 +0100 Subject: [PATCH 5/7] Simplified setting of CXX_MAJOR_VERSION * ACE/include/makeinclude/platform_linux_clang.GNU: --- ACE/include/makeinclude/platform_linux_clang.GNU | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ACE/include/makeinclude/platform_linux_clang.GNU b/ACE/include/makeinclude/platform_linux_clang.GNU index 093aee00bff52..4eaf019d9d5d8 100644 --- a/ACE/include/makeinclude/platform_linux_clang.GNU +++ b/ACE/include/makeinclude/platform_linux_clang.GNU @@ -12,12 +12,7 @@ endif ifndef CXX_VERSION CXX_VERSION := $(shell $(CXX) -dumpversion) endif -ifeq (cmd,$(findstring cmd,$(SHELL))) CXX_MAJOR_VERSION := $(firstword $(subst ., ,$(CXX_VERSION))) -else -CXX_MAJOR_DOT = $(word $2,$(subst ., ,$1)) -CXX_MAJOR_VERSION := $(call CXX_MAJOR_DOT,$(CXX_VERSION),1) -endif # clang 16 and newer default to C++17 ifeq ($(CXX_MAJOR_VERSION),$(filter $(CXX_MAJOR_VERSION),4 5 6 7 8 9 10 11 12 13 14 15)) From 52a2e24942a97482da0b9532ccf4ad7d7ae2604d Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 12 Nov 2024 12:49:51 +0100 Subject: [PATCH 6/7] Removed workarounds for ancient ubuntu versions, only set CXX_FULL_VERSION and CXX_VERSION when not set yet * ACE/include/makeinclude/platform_linux.GNU: --- ACE/include/makeinclude/platform_linux.GNU | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU index 57f1aa6a504ed..574a65462685f 100644 --- a/ACE/include/makeinclude/platform_linux.GNU +++ b/ACE/include/makeinclude/platform_linux.GNU @@ -10,16 +10,11 @@ else CXX_FOR_VERSION_TEST ?= g++ endif -CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version) -CXX_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion) - -ifeq (Ubuntu, $(findstring Ubuntu,$(LSB_RELEASE_ID))) - ifeq (7.10, $(findstring 7.10,$(LSB_RELEASE_RELEASE))) - no_hidden_visibility ?= 1 - endif - ifeq (7.04, $(findstring 7.04,$(LSB_RELEASE_RELEASE))) - no_hidden_visibility ?= 1 - endif +ifndef CXX_FULL_VERSION + CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version) +endif +ifndef CXX_VERSION + CXX_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion) endif ifeq ($(buildbits),32) From 86a03e594c70df8be0dfb569faba305e0595c643 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 12 Nov 2024 12:50:24 +0100 Subject: [PATCH 7/7] Only set certain version variables when not set yet and simplified how to determine the major/minor versions * ACE/include/makeinclude/platform_g++_common.GNU: --- .../makeinclude/platform_g++_common.GNU | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index 6ce9bc5ce2433..7f6b8e7252f18 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -59,20 +59,18 @@ else CXX_FOR_VERSION_TEST ?= $(CXX) endif -CXX_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion) -CXX_MACHINE := $(shell $(CXX_FOR_VERSION_TEST) -dumpmachine) -ifeq (cmd,$(findstring cmd,$(SHELL))) -CXX_MAJOR_VERSION := $(firstword $(subst ., ,$(CXX_VERSION))) -else -CXX_MAJOR_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/\..*$$//') +ifndef CXX_VERSION + CXX_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion) endif -ifeq (cmd,$(findstring cmd,$(SHELL))) -CXX_MINOR_VERSION := $(word 2,$(subst ., ,$(CXX_VERSION))) -else -CXX_MINOR_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/^[0-9]*\.//' | sed -e 's/\..*$$//') +ifndef CXX_MACHINE + CXX_MACHINE := $(shell $(CXX_FOR_VERSION_TEST) -dumpmachine) +endif +ifndef CXX_FULL_VERSION + CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version) endif -CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version) +CXX_MAJOR_VERSION := $(firstword $(subst ., ,$(CXX_VERSION))) +CXX_MINOR_VERSION := $(word 2,$(subst ., ,$(CXX_VERSION))) # Minimum C++ level is now C++17, gcc until version 11 have an older version as default ifeq ($(CXX_MAJOR_VERSION),7)