diff --git a/core/Makefile b/core/Makefile
index 47c2e058..220e6743 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -39,7 +39,7 @@ OBJECTS += zlib/adler32.c zlib/compress.c zlib/crc32.c zlib/deflate.c zlib/gzio.
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/extensions/bintools/Makefile b/extensions/bintools/Makefile
index c875e6af..bf8e3d24 100644
--- a/extensions/bintools/Makefile
+++ b/extensions/bintools/Makefile
@@ -23,7 +23,7 @@ OBJECTS = sdk/smsdk_ext.cpp extension.cpp jit_call.cpp CallWrapper.cpp CallMaker
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/extensions/clientprefs/Makefile b/extensions/clientprefs/Makefile
index 5c2c3a3b..be4c01ee 100644
--- a/extensions/clientprefs/Makefile
+++ b/extensions/clientprefs/Makefile
@@ -23,7 +23,7 @@ OBJECTS = sdk/smsdk_ext.cpp extension.cpp query.cpp cookie.cpp natives.cpp
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/extensions/cstrike/Makefile b/extensions/cstrike/Makefile
index 49e13715..85f2bcb1 100644
--- a/extensions/cstrike/Makefile
+++ b/extensions/cstrike/Makefile
@@ -23,7 +23,7 @@ OBJECTS = sdk/smsdk_ext.cpp extension.cpp natives.cpp RegNatives.cpp timeleft.cp
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/extensions/geoip/Makefile b/extensions/geoip/Makefile
index a258db5b..649773a6 100644
--- a/extensions/geoip/Makefile
+++ b/extensions/geoip/Makefile
@@ -23,7 +23,7 @@ OBJECTS = sdk/smsdk_ext.cpp extension.cpp GeoIP.c
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/extensions/mysql/Makefile b/extensions/mysql/Makefile
index f258d1e8..b477a58f 100644
--- a/extensions/mysql/Makefile
+++ b/extensions/mysql/Makefile
@@ -27,7 +27,7 @@ OBJECTS = sdk/smsdk_ext.cpp extension.cpp \
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/extensions/regex/Makefile b/extensions/regex/Makefile
index fc4dac57..26b7d1ea 100644
--- a/extensions/regex/Makefile
+++ b/extensions/regex/Makefile
@@ -23,7 +23,7 @@ OBJECTS = sdk/smsdk_ext.cpp extension.cpp CRegEx.cpp
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/extensions/sdktools/Makefile b/extensions/sdktools/Makefile
index dbf0c7ec..b56d5e64 100644
--- a/extensions/sdktools/Makefile
+++ b/extensions/sdktools/Makefile
@@ -26,7 +26,7 @@ OBJECTS = sdk/smsdk_ext.cpp extension.cpp vdecoder.cpp vcallbuilder.cpp vcaller.
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/extensions/sqlite/Makefile b/extensions/sqlite/Makefile
index cf8ee596..38346b01 100644
--- a/extensions/sqlite/Makefile
+++ b/extensions/sqlite/Makefile
@@ -43,7 +43,7 @@ OBJECTS += sqlite-source/alter.c sqlite-source/analyze.c \
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/extensions/tf2/Makefile b/extensions/tf2/Makefile
index d0b5234b..8de66b23 100644
--- a/extensions/tf2/Makefile
+++ b/extensions/tf2/Makefile
@@ -24,7 +24,7 @@ OBJECTS = sdk/smsdk_ext.cpp extension.cpp natives.cpp RegNatives.cpp criticals.c
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/extensions/topmenus/Makefile b/extensions/topmenus/Makefile
index de617dad..604cd061 100644
--- a/extensions/topmenus/Makefile
+++ b/extensions/topmenus/Makefile
@@ -24,7 +24,7 @@ OBJECTS = sdk/smsdk_ext.cpp sdk/sm_memtable.cpp extension.cpp TopMenuManager.cpp
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/loader/Makefile b/loader/Makefile
index ee02c339..9b180b1d 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -15,7 +15,7 @@ OBJECTS = loader.cpp
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/public/mms_sample_ext/Makefile b/public/mms_sample_ext/Makefile
index a8fc70cf..498ce2e9 100644
--- a/public/mms_sample_ext/Makefile
+++ b/public/mms_sample_ext/Makefile
@@ -20,7 +20,7 @@ OBJECTS = stub_mm.cpp sm_ext.cpp sm_sdk_config.cpp stub_util.cpp
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/public/sample_ext/Makefile b/public/sample_ext/Makefile
index b52a489e..7c0d3217 100644
--- a/public/sample_ext/Makefile
+++ b/public/sample_ext/Makefile
@@ -23,7 +23,7 @@ OBJECTS = sdk/smsdk_ext.cpp extension.cpp
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/sourcepawn/compiler/Makefile b/sourcepawn/compiler/Makefile
index edbc6ffa..f28d3329 100644
--- a/sourcepawn/compiler/Makefile
+++ b/sourcepawn/compiler/Makefile
@@ -20,7 +20,7 @@ OBJECTS += zlib/adler32.c zlib/compress.c zlib/crc32.c zlib/deflate.c zlib/gzio.
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing -fomit-frame-pointer
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing -fomit-frame-pointer
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
diff --git a/sourcepawn/jit/x86/Makefile b/sourcepawn/jit/x86/Makefile
index 2a5cf89f..00600a28 100644
--- a/sourcepawn/jit/x86/Makefile
+++ b/sourcepawn/jit/x86/Makefile
@@ -15,7 +15,7 @@ OBJECTS = dll_exports.cpp jit_x86.cpp opcode_helpers.cpp
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -s -pipe -fno-strict-aliasing
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops-pipe -fno-strict-aliasing
 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden