From 85139c2194123fc28e07040d5c238da09e8955d4 Mon Sep 17 00:00:00 2001 From: DvirDukhan Date: Sun, 24 Oct 2021 11:01:58 +0300 Subject: [PATCH 1/5] -fcommon for gcc 10 minimal support --- .circleci/config.yml | 1 + CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 53beb19fd..bc0a7ecd8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -79,6 +79,7 @@ commands: command: | git submodule update --init opt/readies ./opt/readies/bin/getpy3 + ./opt/readies/bin/getgcc --modern setup-build-system: steps: diff --git a/CMakeLists.txt b/CMakeLists.txt index c2c4de577..5b10846a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ ENDIF() #---------------------------------------------------------------------------------------------- -SET(CMAKE_CC_COMMON_FLAGS "-fPIC") +SET(CMAKE_CC_COMMON_FLAGS "-fPIC -fcommon") IF (USE_PROFILE) SET(CMAKE_CC_COMMON_FLAGS "${CMAKE_CC_COMMON_FLAGS} -g -ggdb -fno-omit-frame-pointer") ENDIF() From 9bc483ec0e5cbebd40cd93445ee67274bf3a0d49 Mon Sep 17 00:00:00 2001 From: DvirDukhan Date: Sun, 24 Oct 2021 20:20:32 +0300 Subject: [PATCH 2/5] redisfab rmbuilder bullseye --- .circleci/config.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bc0a7ecd8..bf00af911 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -222,7 +222,7 @@ commands: jobs: lint: docker: - - image: redisfab/rmbuilder:6.2.5-x64-buster + - image: redisfab/rmbuilder:6.2.5-x64-bullseye steps: - abort_for_docs - abort_for_noci @@ -235,14 +235,14 @@ jobs: build-and-test: docker: - - image: redisfab/rmbuilder:6.2.5-x64-buster + - image: redisfab/rmbuilder:6.2.5-x64-bullseye steps: - build-steps: platform: debian platforms-build-cpu: docker: - - image: redisfab/rmbuilder:6.2.5-x64-buster + - image: redisfab/rmbuilder:6.2.5-x64-bullseye parameters: lite: # LITE value during make type: string @@ -313,7 +313,7 @@ jobs: coverage: docker: - - image: redisfab/rmbuilder:6.2.5-x64-buster + - image: redisfab/rmbuilder:6.2.5-x64-bullseye steps: - abort_for_docs - abort_for_noci @@ -347,7 +347,7 @@ jobs: type: string default: "CLUSTER=0" docker: - - image: redisfab/rmbuilder:6.2.5-x64-buster + - image: redisfab/rmbuilder:6.2.5-x64-bullseye steps: - abort_for_docs - abort_for_noci @@ -376,14 +376,14 @@ jobs: valgrind-general-for-forked-prs: docker: - - image: redisfab/rmbuilder:6.2.5-x64-buster + - image: redisfab/rmbuilder:6.2.5-x64-bullseye steps: - only_run_if_forked_pull_request - valgrind-general-steps valgrind-general: docker: - - image: redisfab/rmbuilder:6.2.5-x64-buster + - image: redisfab/rmbuilder:6.2.5-x64-bullseye steps: - valgrind-general-steps @@ -417,7 +417,7 @@ jobs: location: type: string docker: - - image: redisfab/rmbuilder:6.2.5-x64-buster + - image: redisfab/rmbuilder:6.2.5-x64-bullseye steps: - abort_for_docs - abort_for_noci @@ -435,7 +435,7 @@ jobs: deploy-snapshot: docker: - - image: redisfab/rmbuilder:6.2.5-x64-buster + - image: redisfab/rmbuilder:6.2.5-x64-bullseye steps: - abort_for_docs - abort_for_noci @@ -452,7 +452,7 @@ jobs: deploy-release: docker: - - image: redisfab/rmbuilder:6.2.5-x64-buster + - image: redisfab/rmbuilder:6.2.5-x64-bullseye steps: - abort_for_docs - abort_for_noci @@ -470,7 +470,7 @@ jobs: release-automation: docker: - - image: redisfab/rmbuilder:6.2.5-x64-buster + - image: redisfab/rmbuilder:6.2.5-x64-bullseye steps: - checkout - setup-automation @@ -484,7 +484,7 @@ jobs: #nightly-automation: # docker: - # - image: redisfab/rmbuilder:6.2.5-x64-buster + # - image: redisfab/rmbuilder:6.2.5-x64-bullseye # steps: # - checkout # - setup-automation From 16c6967c20631b77bbfdc7ed47d223cc66886ec6 Mon Sep 17 00:00:00 2001 From: DvirDukhan Date: Sun, 24 Oct 2021 20:30:38 +0300 Subject: [PATCH 3/5] moved --modern flag to system setup --- .circleci/config.yml | 2 +- opt/system-setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bf00af911..b2d31b10f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -79,7 +79,7 @@ commands: command: | git submodule update --init opt/readies ./opt/readies/bin/getpy3 - ./opt/readies/bin/getgcc --modern + ./opt/readies/bin/getgcc setup-build-system: steps: diff --git a/opt/system-setup.py b/opt/system-setup.py index d991c0378..4207704b4 100755 --- a/opt/system-setup.py +++ b/opt/system-setup.py @@ -26,7 +26,7 @@ def common_first(self): def debian_compat(self): self.run("%s/bin/enable-utf8" % READIES) - self.run("%s/bin/getgcc" % READIES) + self.run("%s/bin/getgcc --modern" % READIES) self.install("gawk") self.install("libssl-dev") self.install("python3-regex") From 928db5f79cdd2771bed9e670996569a62ed91885 Mon Sep 17 00:00:00 2001 From: DvirDukhan Date: Mon, 25 Oct 2021 10:06:40 +0300 Subject: [PATCH 4/5] updated readies --- opt/readies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opt/readies b/opt/readies index 5f12f2619..2d7dffdc1 160000 --- a/opt/readies +++ b/opt/readies @@ -1 +1 @@ -Subproject commit 5f12f261993e756f7c1757fdfb7afdd60788d5d1 +Subproject commit 2d7dffdc192df9e641548f36d065efb645bcce4a From 3b3de8951bd70ab3b6106cbb2c5db75143fca1ac Mon Sep 17 00:00:00 2001 From: DvirDukhan Date: Mon, 25 Oct 2021 10:53:11 +0300 Subject: [PATCH 5/5] valgrind sup --- opt/redis_valgrind.sup | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/opt/redis_valgrind.sup b/opt/redis_valgrind.sup index d509b2e38..3ad133780 100644 --- a/opt/redis_valgrind.sup +++ b/opt/redis_valgrind.sup @@ -175,3 +175,13 @@ fun:epoll_ctl ... } + + +{ + <_dl_catch_exception> + Memcheck:Addr8 + fun:strncmp + ... + fun:_dl_catch_exception + ... +} \ No newline at end of file