Skip to content

Commit

Permalink
Remove support for GCC version 4.5, 4.6, 4.7, 4.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ansaya
Ansaya committed Oct 21, 2023
1 parent 7ff6e28 commit f0c5698
Show file tree
Hide file tree
Showing 24 changed files with 23 additions and 1,881 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Update 'COMPILERS' to install needed frontend compiler versions
"args": {
"VARIANT": "bionic-23.10",
"COMPILERS": "gcc-4.5,gcc-4.6,gcc-4.7,gcc-4.8,gcc-4.9,gcc-5,gcc-6,gcc-7,gcc-8,clang-4,clang-5,clang-6,clang-7,clang-8,clang-9,clang-10,clang-11,clang-12"
"COMPILERS": "gcc-4.9,gcc-5,gcc-6,gcc-7,gcc-8,clang-4,clang-5,clang-6,clang-7,clang-8,clang-9,clang-10,clang-11,clang-12"
}
},
"remoteUser": "vscode"
Expand Down
12 changes: 0 additions & 12 deletions .devcontainer/library-scripts/compiler-download.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,6 @@ inflate() {
clang-4 )
url="https://releases.llvm.org/4.0.0/clang+llvm-4.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz"
;;
gcc-4.5 )
url="${bambuhls_compiler_url}/gcc-4.5-bambu-Ubuntu_16.04.tar.xz"
;;
gcc-4.6 )
url="${bambuhls_compiler_url}/gcc-4.6-bambu-Ubuntu_16.04.tar.xz"
;;
gcc-4.7 )
url="${bambuhls_compiler_url}/gcc-4.7-bambu-Ubuntu_16.04.tar.xz"
;;
gcc-4.8 )
url="${bambuhls_compiler_url}/gcc-4.8-bambu-Ubuntu_16.04.tar.xz"
;;
gcc-4.9 )
url="${bambuhls_compiler_url}/gcc-4.9-bambu-Ubuntu_16.04.tar.xz"
;;
Expand Down
2 changes: 0 additions & 2 deletions .github/actions/build-gcc/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ shift

workspace_dir=$PWD

#Necessary for gcc-4.5
export LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h

function cleanup {
Expand Down
2 changes: 0 additions & 2 deletions .github/actions/generate-appimage/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ function cleanup {
}
trap cleanup EXIT

#Necessary for gcc-4.5
export LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
ln -sf /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h

echo "::group::Initialize workspace"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/full-gcc.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: ./.github/workflows/build-appimage.yml
with:
package-name: bambu-gcc-full
compilers: gcc-4.5,gcc-4.6,gcc-4.7,gcc-4.8,gcc-4.9,gcc-5,gcc-6,gcc-7,gcc-8,clang-6
compilers: gcc-4.9,gcc-5,gcc-6,gcc-7,gcc-8,clang-6
build-compiler: gcc-8
configure: --enable-glpk --enable-flopoco --enable-opt --with-opt-level=2 --enable-release CC=gcc-8 CXX=g++-8
secrets: inherit
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
uses: ./.github/workflows/reusable-grs.yml
with:
package-name: ${{needs.build.outputs.package-name}}
test-compilers: \"I386_GCC45 --skip_list 20071202-1\",I386_GCC46,I386_GCC47,I386_GCC48,I386_GCC49,I386_GCC5,I386_GCC6,I386_GCC7,I386_GCC8
test-compilers: I386_GCC49,I386_GCC5,I386_GCC6,I386_GCC7,I386_GCC8
additional-args: \"\",\"-c=--speculative-sdc-scheduling --skip_list 20040705-1,20040705-2,20040629-1,memset-3\"
secrets: inherit

Expand All @@ -92,7 +92,7 @@ jobs:
uses: ./.github/workflows/reusable-grs-vhdl.yml
with:
package-name: ${{needs.build.outputs.package-name}}
test-compilers: \"I386_GCC45 --skip_list 20071202-1\",I386_GCC46,I386_GCC47,I386_GCC48,I386_GCC49,I386_GCC5,I386_GCC6,I386_GCC7,I386_GCC8
test-compilers: I386_GCC49,I386_GCC5,I386_GCC6,I386_GCC7,I386_GCC8
secrets: inherit

examples:
Expand Down
9 changes: 7 additions & 2 deletions Makefile.init
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,21 @@ buildenv-shell : compose-up
@docker compose -f .devcontainer/docker-compose.yml exec -i -e J=$J buildenv bash
@docker compose -f .devcontainer/docker-compose.yml stop -t 0

appimage-build : buildenv-sync
buildenv-build : buildenv-sync
@echo "Configure options: $(APP_CONFIGURE)"
@docker compose -f .devcontainer/docker-compose.yml exec -e J=$J buildenv bash /workspace/.devcontainer/library-scripts/appimage-build.sh /panda_dist/distdir /panda_dist/bambu.AppImage $(APP_CONFIGURE)
@docker compose -f .devcontainer/docker-compose.yml exec buildenv chown -R $(shell id -u):$(shell id -g) /panda_dist/distdir || true
@docker compose -f .devcontainer/docker-compose.yml stop -t 0

appimage-setup : buildenv-sync
buildenv-setup : buildenv-sync
@docker compose -f .devcontainer/docker-compose.yml exec buildenv bash /workspace/.devcontainer/library-scripts/compiler-download.sh / $(APP_COMPILERS) /compilers
@docker compose -f .devcontainer/docker-compose.yml exec buildenv bash /workspace/.devcontainer/library-scripts/compiler-setup.sh
@docker compose -f .devcontainer/docker-compose.yml exec buildenv bash /workspace/.devcontainer/library-scripts/appimage-setup.sh /panda_dist/distdir $(APP_COMPILERS) /compilers
@echo "Initializing PandA build environment"
@docker compose -f .devcontainer/docker-compose.yml exec buildenv make --directory=/workspace -f Makefile.init
@docker compose -f .devcontainer/docker-compose.yml stop -t 0

buildenv-init : buildenv-sync
@echo "Initializing PandA build environment"
@docker compose -f .devcontainer/docker-compose.yml exec buildenv make --directory=/workspace -f Makefile.init
@docker compose -f .devcontainer/docker-compose.yml stop -t 0
46 changes: 0 additions & 46 deletions QTCreator-PandA-GitHub.files
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,6 @@ build/config_headers/config_HAVE_I386_CLANG7_COMPILER.hpp
build/config_headers/config_HAVE_I386_CLANG7_M32.hpp
build/config_headers/config_HAVE_I386_CLANG7_M64.hpp
build/config_headers/config_HAVE_I386_CLANG7_MX32.hpp
build/config_headers/config_HAVE_I386_GCC45_COMPILER.hpp
build/config_headers/config_HAVE_I386_GCC46_COMPILER.hpp
build/config_headers/config_HAVE_I386_GCC47_COMPILER.hpp
build/config_headers/config_HAVE_I386_GCC47_M32.hpp
build/config_headers/config_HAVE_I386_GCC47_M64.hpp
build/config_headers/config_HAVE_I386_GCC47_MX32.hpp
build/config_headers/config_HAVE_I386_GCC48_COMPILER.hpp
build/config_headers/config_HAVE_I386_GCC48_M32.hpp
build/config_headers/config_HAVE_I386_GCC48_M64.hpp
build/config_headers/config_HAVE_I386_GCC48_MX32.hpp
build/config_headers/config_HAVE_I386_GCC49_COMPILER.hpp
build/config_headers/config_HAVE_I386_GCC49_M32.hpp
build/config_headers/config_HAVE_I386_GCC49_M64.hpp
Expand Down Expand Up @@ -187,46 +177,10 @@ build/config_headers/config_I386_CLANG_CPP4_EXE.hpp
build/config_headers/config_I386_CLANG_CPP5_EXE.hpp
build/config_headers/config_I386_CLANG_CPP6_EXE.hpp
build/config_headers/config_I386_CLANG_CPP7_EXE.hpp
build/config_headers/config_I386_CPP45_EXE.hpp
build/config_headers/config_I386_CPP46_EXE.hpp
build/config_headers/config_I386_CPP47_EXE.hpp
build/config_headers/config_I386_CPP48_EXE.hpp
build/config_headers/config_I386_CPP49_EXE.hpp
build/config_headers/config_I386_CPP5_EXE.hpp
build/config_headers/config_I386_CPP6_EXE.hpp
build/config_headers/config_I386_CPP7_EXE.hpp
build/config_headers/config_I386_GCC45_EMPTY_PLUGIN.hpp
build/config_headers/config_I386_GCC45_EXE.hpp
build/config_headers/config_I386_GCC45_PLUGIN_COMPILER.hpp
build/config_headers/config_I386_GCC45_SSAVRP_PLUGIN.hpp
build/config_headers/config_I386_GCC45_SSA_PLUGIN.hpp
build/config_headers/config_I386_GCC45_SSA_PLUGINCPP.hpp
build/config_headers/config_I386_GCC45_TOPFNAME_PLUGIN.hpp
build/config_headers/config_I386_GCC45_VERSION.hpp
build/config_headers/config_I386_GCC46_EMPTY_PLUGIN.hpp
build/config_headers/config_I386_GCC46_EXE.hpp
build/config_headers/config_I386_GCC46_PLUGIN_COMPILER.hpp
build/config_headers/config_I386_GCC46_SSAVRP_PLUGIN.hpp
build/config_headers/config_I386_GCC46_SSA_PLUGIN.hpp
build/config_headers/config_I386_GCC46_SSA_PLUGINCPP.hpp
build/config_headers/config_I386_GCC46_TOPFNAME_PLUGIN.hpp
build/config_headers/config_I386_GCC46_VERSION.hpp
build/config_headers/config_I386_GCC47_EMPTY_PLUGIN.hpp
build/config_headers/config_I386_GCC47_EXE.hpp
build/config_headers/config_I386_GCC47_PLUGIN_COMPILER.hpp
build/config_headers/config_I386_GCC47_SSAVRP_PLUGIN.hpp
build/config_headers/config_I386_GCC47_SSA_PLUGIN.hpp
build/config_headers/config_I386_GCC47_SSA_PLUGINCPP.hpp
build/config_headers/config_I386_GCC47_TOPFNAME_PLUGIN.hpp
build/config_headers/config_I386_GCC47_VERSION.hpp
build/config_headers/config_I386_GCC48_EMPTY_PLUGIN.hpp
build/config_headers/config_I386_GCC48_EXE.hpp
build/config_headers/config_I386_GCC48_PLUGIN_COMPILER.hpp
build/config_headers/config_I386_GCC48_SSAVRP_PLUGIN.hpp
build/config_headers/config_I386_GCC48_SSA_PLUGIN.hpp
build/config_headers/config_I386_GCC48_SSA_PLUGINCPP.hpp
build/config_headers/config_I386_GCC48_TOPFNAME_PLUGIN.hpp
build/config_headers/config_I386_GCC48_VERSION.hpp
build/config_headers/config_I386_GCC49_EMPTY_PLUGIN.hpp
build/config_headers/config_I386_GCC49_EXE.hpp
build/config_headers/config_I386_GCC49_PLUGIN_COMPILER.hpp
Expand Down
36 changes: 2 additions & 34 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ if test "x$panda_USE_BAMBU" = xyes; then
panda_USE_SYNTHESIS_TOOL=yes;
panda_USE_TASTE=yes;
panda_USE_TREE_PANDA_GCC=yes;
AS_VERSION_COMPARE($MIN_GCC_VERSION, [4.5.0], [MIN_GCC_VERSION=4.5.0],,)
AS_VERSION_COMPARE($MIN_GCC_VERSION, [4.9.0], [MIN_GCC_VERSION=4.9.0],,)
AS_VERSION_COMPARE($MAX_GCC_VERSION, [9.0.0],,,[MAX_GCC_VERSION=9.0.0])
AS_VERSION_COMPARE($MIN_CLANG_VERSION, [4.0.0], [MIN_CLANG_VERSION=4.0.0],,)
AS_VERSION_COMPARE($MAX_CLANG_VERSION, [17.0.0],,,[MAX_CLANG_VERSION=17.0.0])
Expand Down Expand Up @@ -1216,10 +1216,6 @@ if test "x$panda_USE_I386_GCC" = xyes; then
EXTRA_CLANG_OPTIONS=-D_GLIBCXX_USE_CXX11_ABI=0
fi
AC_CHECK_GCC_PLUGIN_DIR
AC_CHECK_GCC45_I386_VERSION($MIN_GCC_VERSION,$MAX_GCC_VERSION)
AC_CHECK_GCC46_I386_VERSION($MIN_GCC_VERSION,$MAX_GCC_VERSION)
AC_CHECK_GCC47_I386_VERSION($MIN_GCC_VERSION,$MAX_GCC_VERSION)
AC_CHECK_GCC48_I386_VERSION($MIN_GCC_VERSION,$MAX_GCC_VERSION)
AC_CHECK_GCC49_I386_VERSION($MIN_GCC_VERSION,$MAX_GCC_VERSION)
AC_CHECK_GCC5_I386_VERSION($MIN_GCC_VERSION,$MAX_GCC_VERSION)
AC_CHECK_GCC6_I386_VERSION($MIN_GCC_VERSION,$MAX_GCC_VERSION)
Expand All @@ -1239,39 +1235,11 @@ if test "x$panda_USE_I386_GCC" = xyes; then
AC_CHECK_CLANG16_I386_VERSION($MIN_CLANG_VERSION,$MAX_CLANG_VERSION,$EXTRA_CLANG_OPTIONS)
AC_CHECK_CLANGVVD_I386_VERSION($MIN_CLANG_VERSION,$MAX_CLANG_VERSION,$EXTRA_CLANG_OPTIONS)

if test "x$I386_GCC45_PLUGIN_COMPILER" = x && test "x$I386_GCC46_PLUGIN_COMPILER" = x && test "x$I386_GCC47_PLUGIN_COMPILER" = x && test "x$I386_GCC48_PLUGIN_COMPILER" = x && test "x$I386_GCC49_PLUGIN_COMPILER" = x && test "x$I386_GCC5_PLUGIN_COMPILER" = x && test "x$I386_GCC6_PLUGIN_COMPILER" = x && test "x$I386_GCC7_PLUGIN_COMPILER" = x && test "x$I386_GCC8_PLUGIN_COMPILER" = x && test "x$I386_CLANG4_PLUGIN_COMPILER" = x && test "x$I386_CLANG5_PLUGIN_COMPILER" = x && test "x$I386_CLANG6_PLUGIN_COMPILER" = x && test "x$I386_CLANG7_PLUGIN_COMPILER" = x && test "x$I386_CLANG8_PLUGIN_COMPILER" = x && test "x$I386_CLANG9_PLUGIN_COMPILER" = x && test "x$I386_CLANG10_PLUGIN_COMPILER" = x && test "x$I386_CLANG11_PLUGIN_COMPILER" = x && test "x$I386_CLANG12_PLUGIN_COMPILER" = x && test "x$I386_CLANG13_PLUGIN_COMPILER" = x && test "x$I386_CLANG16_PLUGIN_COMPILER" = x && test "x$I386_CLANGVVD_PLUGIN_COMPILER" = x; then
if test "x$I386_GCC49_PLUGIN_COMPILER" = x && test "x$I386_GCC5_PLUGIN_COMPILER" = x && test "x$I386_GCC6_PLUGIN_COMPILER" = x && test "x$I386_GCC7_PLUGIN_COMPILER" = x && test "x$I386_GCC8_PLUGIN_COMPILER" = x && test "x$I386_CLANG4_PLUGIN_COMPILER" = x && test "x$I386_CLANG5_PLUGIN_COMPILER" = x && test "x$I386_CLANG6_PLUGIN_COMPILER" = x && test "x$I386_CLANG7_PLUGIN_COMPILER" = x && test "x$I386_CLANG8_PLUGIN_COMPILER" = x && test "x$I386_CLANG9_PLUGIN_COMPILER" = x && test "x$I386_CLANG10_PLUGIN_COMPILER" = x && test "x$I386_CLANG11_PLUGIN_COMPILER" = x && test "x$I386_CLANG12_PLUGIN_COMPILER" = x && test "x$I386_CLANG13_PLUGIN_COMPILER" = x && test "x$I386_CLANG16_PLUGIN_COMPILER" = x && test "x$I386_CLANGVVD_PLUGIN_COMPILER" = x; then
AC_MSG_ERROR("gcc with support to -m32 and plugin not found")
fi
fi

AM_CONDITIONAL(BUILD_I386_GCC45, test "x$build_I386_GCC45" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC45_EMPTY_PLUGIN, test "x$build_I386_GCC45_EMPTY_PLUGIN" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC45_SSA_PLUGIN, test "x$build_I386_GCC45_SSA_PLUGIN" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC45_SSA_PLUGINCPP, test "x$build_I386_GCC45_SSA_PLUGINCPP" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC45_SSAVRP_PLUGIN, test "x$build_I386_GCC45_SSAVRP_PLUGIN" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC45_TOPFNAME_PLUGIN, test "x$build_I386_GCC45_TOPFNAME_PLUGIN" = xyes)

AM_CONDITIONAL(BUILD_I386_GCC46, test "x$build_I386_GCC46" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC46_EMPTY_PLUGIN, test "x$build_I386_GCC46_EMPTY_PLUGIN" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC46_SSA_PLUGIN, test "x$build_I386_GCC46_SSA_PLUGIN" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC46_SSA_PLUGINCPP, test "x$build_I386_GCC46_SSA_PLUGINCPP" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC46_SSAVRP_PLUGIN, test "x$build_I386_GCC46_SSAVRP_PLUGIN" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC46_TOPFNAME_PLUGIN, test "x$build_I386_GCC46_TOPFNAME_PLUGIN" = xyes)

AM_CONDITIONAL(BUILD_I386_GCC47, test "x$build_I386_GCC47" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC47_EMPTY_PLUGIN, test "x$build_I386_GCC47_EMPTY_PLUGIN" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC47_SSA_PLUGIN, test "x$build_I386_GCC47_SSA_PLUGIN" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC47_SSA_PLUGINCPP, test "x$build_I386_GCC47_SSA_PLUGINCPP" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC47_SSAVRP_PLUGIN, test "x$build_I386_GCC47_SSAVRP_PLUGIN" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC47_TOPFNAME_PLUGIN, test "x$build_I386_GCC47_TOPFNAME_PLUGIN" = xyes)

AM_CONDITIONAL(BUILD_I386_GCC48, test "x$build_I386_GCC48" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC48_EMPTY_PLUGIN, test "x$build_I386_GCC48_EMPTY_PLUGIN" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC48_SSA_PLUGIN, test "x$build_I386_GCC48_SSA_PLUGIN" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC48_SSA_PLUGINCPP, test "x$build_I386_GCC48_SSA_PLUGINCPP" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC48_SSAVRP_PLUGIN, test "x$build_I386_GCC48_SSAVRP_PLUGIN" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC48_TOPFNAME_PLUGIN, test "x$build_I386_GCC48_TOPFNAME_PLUGIN" = xyes)

AM_CONDITIONAL(BUILD_I386_GCC49, test "x$build_I386_GCC49" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC49_EMPTY_PLUGIN, test "x$build_I386_GCC49_EMPTY_PLUGIN" = xyes)
AM_CONDITIONAL(BUILD_I386_GCC49_SSA_PLUGIN, test "x$build_I386_GCC49_SSA_PLUGIN" = xyes)
Expand Down
Loading

0 comments on commit f0c5698

Please sign in to comment.