From b773710d06b7aa92268d34d8f269d80f398b155c Mon Sep 17 00:00:00 2001 From: mattijs <mattijs@hunt.opencfd.co.uk> Date: Tue, 28 Apr 2009 22:20:12 +0100 Subject: [PATCH] remove opteron and no-gcse switch modified: SiCortex64Gcc/cOpt modified: SunOS64Gcc/cOpt modified: linux64Gcc/c++Opt modified: linux64Gcc/cOpt modified: linux64Gcc/general modified: linux64Gcc42/c++Opt modified: linux64Gcc42/cOpt modified: linuxGcc/c++ modified: linuxGcc/cDebug modified: linuxGcc/general modified: linuxIA64Gcc/cOpt --- wmake/rules/SiCortex64Gcc/cOpt | 2 +- wmake/rules/SunOS64Gcc/cOpt | 2 +- wmake/rules/linux64Gcc/c++Opt | 2 +- wmake/rules/linux64Gcc/cOpt | 2 +- wmake/rules/linux64Gcc/general | 2 +- wmake/rules/linux64Gcc42/c++Opt | 2 +- wmake/rules/linux64Gcc42/cOpt | 2 +- wmake/rules/linuxGcc/c++ | 2 +- wmake/rules/linuxGcc/cDebug | 2 +- wmake/rules/linuxGcc/general | 3 ++- wmake/rules/linuxIA64Gcc/cOpt | 2 +- wmake/rules/linuxPPC64Gcc/cOpt | 2 +- 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/wmake/rules/SiCortex64Gcc/cOpt b/wmake/rules/SiCortex64Gcc/cOpt index aaaebef3d3e..a8b0635478d 100644 --- a/wmake/rules/SiCortex64Gcc/cOpt +++ b/wmake/rules/SiCortex64Gcc/cOpt @@ -1,2 +1,2 @@ cDBUG = -cOPT = -O3 -fno-gcse +cOPT = -O3 diff --git a/wmake/rules/SunOS64Gcc/cOpt b/wmake/rules/SunOS64Gcc/cOpt index aaaebef3d3e..a8b0635478d 100644 --- a/wmake/rules/SunOS64Gcc/cOpt +++ b/wmake/rules/SunOS64Gcc/cOpt @@ -1,2 +1,2 @@ cDBUG = -cOPT = -O3 -fno-gcse +cOPT = -O3 diff --git a/wmake/rules/linux64Gcc/c++Opt b/wmake/rules/linux64Gcc/c++Opt index f19996b72da..8ac07d2124e 100644 --- a/wmake/rules/linux64Gcc/c++Opt +++ b/wmake/rules/linux64Gcc/c++Opt @@ -1,4 +1,4 @@ c++DBUG = -c++OPT = -march=opteron -O3 +c++OPT = -O3 #c++OPT = -march=nocona -O3 # -ftree-vectorize -ftree-vectorizer-verbose=3 diff --git a/wmake/rules/linux64Gcc/cOpt b/wmake/rules/linux64Gcc/cOpt index 7285a9de969..a8b0635478d 100644 --- a/wmake/rules/linux64Gcc/cOpt +++ b/wmake/rules/linux64Gcc/cOpt @@ -1,2 +1,2 @@ cDBUG = -cOPT = -march=opteron -O3 -fno-gcse +cOPT = -O3 diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general index 11b48acc3fc..3c2e4db2ee3 100644 --- a/wmake/rules/linux64Gcc/general +++ b/wmake/rules/linux64Gcc/general @@ -1,5 +1,5 @@ CPP = /lib/cpp $(GFLAGS) -LD = ld -A64 +LD = ld PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linux64Gcc42/c++Opt b/wmake/rules/linux64Gcc42/c++Opt index f19996b72da..8ac07d2124e 100644 --- a/wmake/rules/linux64Gcc42/c++Opt +++ b/wmake/rules/linux64Gcc42/c++Opt @@ -1,4 +1,4 @@ c++DBUG = -c++OPT = -march=opteron -O3 +c++OPT = -O3 #c++OPT = -march=nocona -O3 # -ftree-vectorize -ftree-vectorizer-verbose=3 diff --git a/wmake/rules/linux64Gcc42/cOpt b/wmake/rules/linux64Gcc42/cOpt index 7285a9de969..a8b0635478d 100644 --- a/wmake/rules/linux64Gcc42/cOpt +++ b/wmake/rules/linux64Gcc42/cOpt @@ -1,2 +1,2 @@ cDBUG = -cOPT = -march=opteron -O3 -fno-gcse +cOPT = -O3 diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++ index ab2410d3d0a..64d6797573c 100644 --- a/wmake/rules/linuxGcc/c++ +++ b/wmake/rules/linuxGcc/c++ @@ -8,7 +8,7 @@ include $(RULES)/c++$(WM_COMPILE_OPTION) ptFLAGS = -DNoRepository -ftemplate-depth-40 -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -pthread +c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linuxGcc/cDebug b/wmake/rules/linuxGcc/cDebug index 6c71ed93e8a..72b638f4582 100644 --- a/wmake/rules/linuxGcc/cDebug +++ b/wmake/rules/linuxGcc/cDebug @@ -1,2 +1,2 @@ cDBUG = -ggdb -DFULLDEBUG -cOPT = -O1 -finline-functions +cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general index c300368ee66..d009001a6e3 100644 --- a/wmake/rules/linuxGcc/general +++ b/wmake/rules/linuxGcc/general @@ -1,10 +1,11 @@ CPP = /lib/cpp $(GFLAGS) LD = ld -melf_i386 -PROJECT_LIBS = -l$(WM_PROJECT) -ldl +PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard include $(RULES)/X include $(RULES)/c include $(RULES)/c++ +include $(GENERAL_RULES)/cint diff --git a/wmake/rules/linuxIA64Gcc/cOpt b/wmake/rules/linuxIA64Gcc/cOpt index aaaebef3d3e..a8b0635478d 100644 --- a/wmake/rules/linuxIA64Gcc/cOpt +++ b/wmake/rules/linuxIA64Gcc/cOpt @@ -1,2 +1,2 @@ cDBUG = -cOPT = -O3 -fno-gcse +cOPT = -O3 diff --git a/wmake/rules/linuxPPC64Gcc/cOpt b/wmake/rules/linuxPPC64Gcc/cOpt index e6512b7aab4..17318709f1f 100644 --- a/wmake/rules/linuxPPC64Gcc/cOpt +++ b/wmake/rules/linuxPPC64Gcc/cOpt @@ -1,2 +1,2 @@ cDBUG = -cOPT = -O3 -fno-gcse +cOPT = -O3 -- GitLab