From e15b103003578e1eb916a739e9a3dc6b200ff6b0 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 7 Nov 2022 09:37:50 +0100 Subject: [PATCH] COMP: remove wmake rules for ARM7 (discontinued) arch --- etc/config.csh/settings | 5 ----- etc/config.sh/settings | 5 ----- wmake/rules/linuxARM7Gcc/c | 18 ------------------ wmake/rules/linuxARM7Gcc/c++ | 21 --------------------- wmake/rules/linuxARM7Gcc/c++Debug | 2 -- wmake/rules/linuxARM7Gcc/c++Opt | 5 ----- wmake/rules/linuxARM7Gcc/cDebug | 2 -- wmake/rules/linuxARM7Gcc/cOpt | 3 --- wmake/rules/linuxARM7Gcc/general | 14 -------------- 9 files changed, 75 deletions(-) delete mode 100644 wmake/rules/linuxARM7Gcc/c delete mode 100644 wmake/rules/linuxARM7Gcc/c++ delete mode 100644 wmake/rules/linuxARM7Gcc/c++Debug delete mode 100644 wmake/rules/linuxARM7Gcc/c++Opt delete mode 100644 wmake/rules/linuxARM7Gcc/cDebug delete mode 100644 wmake/rules/linuxARM7Gcc/cOpt delete mode 100644 wmake/rules/linuxARM7Gcc/general diff --git a/etc/config.csh/settings b/etc/config.csh/settings index a0100abeeb..cc9da12d65 100644 --- a/etc/config.csh/settings +++ b/etc/config.csh/settings @@ -52,11 +52,6 @@ case Linux: setenv WM_COMPILER_LIB_ARCH 64 # Use lib64 breaksw - case armv7l: - setenv WM_ARCH linuxARM7 - setenv WM_COMPILER_LIB_ARCH 32 # Use lib32 - breaksw - case ppc64: setenv WM_ARCH linuxPPC64 setenv WM_COMPILER_LIB_ARCH 64 # Use lib64 diff --git a/etc/config.sh/settings b/etc/config.sh/settings index 0555cbb9cf..7735c4cf41 100644 --- a/etc/config.sh/settings +++ b/etc/config.sh/settings @@ -49,11 +49,6 @@ Linux) export WM_COMPILER_LIB_ARCH=64 # Use lib64 ;; - armv7l) - WM_ARCH=linuxARM7 - export WM_COMPILER_LIB_ARCH=32 # Use lib32 - ;; - ppc64) WM_ARCH=linuxPPC64 export WM_COMPILER_LIB_ARCH=64 # Use lib64 diff --git a/wmake/rules/linuxARM7Gcc/c b/wmake/rules/linuxARM7Gcc/c deleted file mode 100644 index cf19662b5e..0000000000 --- a/wmake/rules/linuxARM7Gcc/c +++ /dev/null @@ -1,18 +0,0 @@ -#------------------------------------------------------------------------------ -include $(GENERAL_RULES)/Gcc/c - -cARCH := -mcpu=cortex-a9 - -ifneq (,$(WM_COMPILE_OPTION)) - sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -endif - -cFLAGS = \ - $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) \ - $(FOAM_EXTRA_CFLAGS) $(LIB_HEADER_DIRS) -fPIC - -ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@ - -include $(GENERAL_RULES)/Gcc/link-c - -#------------------------------------------------------------------------------ diff --git a/wmake/rules/linuxARM7Gcc/c++ b/wmake/rules/linuxARM7Gcc/c++ deleted file mode 100644 index 08b1ed5aa3..0000000000 --- a/wmake/rules/linuxARM7Gcc/c++ +++ /dev/null @@ -1,21 +0,0 @@ -#------------------------------------------------------------------------------ -include $(GENERAL_RULES)/Gcc/c++ - -c++ARCH := -mcpu=cortex-a9 -pthread - -ifneq (,$(WM_COMPILE_OPTION)) - sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -endif - -c++FLAGS = \ - $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) \ - $(FOAM_EXTRA_CXXFLAGS) $(LIB_HEADER_DIRS) -fPIC - -Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ -cctoo = $(Ctoo) -cpptoo = $(Ctoo) -cxxtoo = $(Ctoo) - -include $(GENERAL_RULES)/Gcc/link-c++ - -#------------------------------------------------------------------------------ diff --git a/wmake/rules/linuxARM7Gcc/c++Debug b/wmake/rules/linuxARM7Gcc/c++Debug deleted file mode 100644 index 08680a0e4a..0000000000 --- a/wmake/rules/linuxARM7Gcc/c++Debug +++ /dev/null @@ -1,2 +0,0 @@ -c++DBUG = -ggdb3 -DFULLDEBUG -c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linuxARM7Gcc/c++Opt b/wmake/rules/linuxARM7Gcc/c++Opt deleted file mode 100644 index ab2bfabcd0..0000000000 --- a/wmake/rules/linuxARM7Gcc/c++Opt +++ /dev/null @@ -1,5 +0,0 @@ -c++DBUG = -#c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mfpu=vfpv3-d16 -mfloat-abi=hard -c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mfpu=vfpv3-d16 -mfloat-abi=softfp - -ROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linuxARM7Gcc/cDebug b/wmake/rules/linuxARM7Gcc/cDebug deleted file mode 100644 index 72b638f458..0000000000 --- a/wmake/rules/linuxARM7Gcc/cDebug +++ /dev/null @@ -1,2 +0,0 @@ -cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/linuxARM7Gcc/cOpt b/wmake/rules/linuxARM7Gcc/cOpt deleted file mode 100644 index 6efb6d39bf..0000000000 --- a/wmake/rules/linuxARM7Gcc/cOpt +++ /dev/null @@ -1,3 +0,0 @@ -cDBUG = -#cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mfpu=vfpv3-d16 -mfloat-abi=hard -cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mfpu=vfpv3-d16 -mfloat-abi=softfp diff --git a/wmake/rules/linuxARM7Gcc/general b/wmake/rules/linuxARM7Gcc/general deleted file mode 100644 index 676a1fd1f1..0000000000 --- a/wmake/rules/linuxARM7Gcc/general +++ /dev/null @@ -1,14 +0,0 @@ -CPP = cpp -traditional-cpp $(GFLAGS) -LD = ld - -include $(GENERAL_RULES)/standard -include $(GENERAL_RULES)/Gcc/openmp - -ifneq (,$(findstring ~openmp,$(WM_COMPILE_CONTROL))) - include $(GENERAL_RULES)/no-openmp -endif - -include $(DEFAULT_RULES)/c -include $(DEFAULT_RULES)/c++ - -#------------------------------------------------------------------------------