diff --git a/wmake/rules/SiCortex64Gcc/cOpt b/wmake/rules/SiCortex64Gcc/cOpt
index aaaebef3d3e351358499981b5d4ef1dd2caace7b..a8b0635478db6e5968733b2f5f8f341b4af61d18 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 aaaebef3d3e351358499981b5d4ef1dd2caace7b..a8b0635478db6e5968733b2f5f8f341b4af61d18 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 f19996b72da7dec07cabe27333dc4b083b5eff07..8ac07d2124e4b49b9bda82d3ea0c4380b9c6b8e6 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 7285a9de969b5bec20a2c21b3289e7788edf1865..a8b0635478db6e5968733b2f5f8f341b4af61d18 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 11b48acc3fc0c67c177b464c70de18248881c12d..3c2e4db2ee31ca84bfb6adcd135f9b3651195c0a 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 f19996b72da7dec07cabe27333dc4b083b5eff07..8ac07d2124e4b49b9bda82d3ea0c4380b9c6b8e6 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 7285a9de969b5bec20a2c21b3289e7788edf1865..a8b0635478db6e5968733b2f5f8f341b4af61d18 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 ab2410d3d0a394662084078b46bd1c965913065d..64d6797573c2f703a7f16ef48ca2ee8f372b2216 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 6c71ed93e8a1720b7d9e7baef5255dd8981e09f8..72b638f458220e329d52b59e3566a3c807101f9d 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 c300368ee66bf38f939c97d8da0314da524619b7..d009001a6e3a18369eb608cede9eed6bdc600606 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 aaaebef3d3e351358499981b5d4ef1dd2caace7b..a8b0635478db6e5968733b2f5f8f341b4af61d18 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 e6512b7aab42b97fe9e77a1d60fe586e5c1dc104..17318709f1fa39e6bf89cbe87778bc6fa459de17 100644
--- a/wmake/rules/linuxPPC64Gcc/cOpt
+++ b/wmake/rules/linuxPPC64Gcc/cOpt
@@ -1,2 +1,2 @@
 cDBUG       =
-cOPT        = -O3 -fno-gcse
+cOPT        = -O3