--- a/makelib/config-linux-x86_64.make	Mon Mar 06 21:21:07 2017 +0000
+++ b/makelib/config-linux-x86_64.make	Tue Mar 21 13:00:49 2017 +0000
@@ -26,14 +26,6 @@
 	-Wl,-z,now,-Bsymbolic,-rpath,'$$ORIGIN',-rpath,'$$ORIGIN/lib',-rpath,'$$ORIGIN/../lib'
 EXTRA_SHARED_LIBS=-ldl
 
-#
-# ATTENTION: with gcc3.2 fPIC + O6 generates wrong code in stc - sigh
-# gcc toplevel-reorder breaks relative function offset generation (leads to SIGSEGV)
-OPT=-O2 -fno-toplevel-reorder -fno-stack-protector
-
-# workaround for failing longjmp check: undefine FORTIFY_SOURCE, which is enabled by default on Gentoo. Remove when fixed.
-LIBRUN_OPT=-g -O -fno-stack-protector -U_FORTIFY_SOURCE -Wno-comment -Wno-pointer-sign -Wno-unused-variable -Wno-unused-parameter -Wno-unused-label -Wall
-
 #OPTIONAL_DL_LIB=-ldl
 #OPTIONAL_LIBDL_TARGET=libdld
 
@@ -76,8 +68,6 @@
 #	$(LD) -shared $(LDFLAGS) -o $*.so $*.o $(LOCAL_SHARED_LIBS)
 
 #------------------ end of linux-elf/x86_64 ---------------------
-OPT?=-pipe -fno-omit-frame-pointer -fno-stack-protector -fno-strict-aliasing -fwrapv -fPIC  -ggdb3
-LIBRUN_OPT?=$(OPT)
 O_RULE=__STANDARD_O_RULE__
 EXTRA_LIBS=-ldl -lX11 -lXext
 MAKE_ZLIB_ARG= "CFLAGS=-fPIC -O3 -DUSE_MMAP"