diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index c5114a92..0b6d5557 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -270,7 +270,6 @@ PKG_CONFIGDIRMODE   ?= $(CFGDIRMODE)
 #USE_MCHECK                     ?= true # not thread-safe
 #USE_MEMWATCH                   ?= true
 #USE_MPATROL                    ?= true
-#USE_PROFILER                   ?= true
 #USE_TRACING                    ?= true
 #USE_TIMER                      ?= true
 LOG_THREAD_NAMES               ?= true
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index 2409f835..d5de97ff 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -270,7 +270,6 @@ PKG_CONFIGDIRMODE   ?= $(CFGDIRMODE)
 #USE_MCHECK                     ?= true
 #USE_MEMWATCH                   ?= true
 #USE_MPATROL                    ?= true
-#USE_PROFILER                   ?= true
 #USE_TRACING                    ?= true
 #USE_TIMER                      ?= true
 LOG_THREAD_NAMES               ?= true
diff --git a/make/defs.mk b/make/defs.mk
index a0ae7d4b..5c7ad05d 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -816,18 +816,6 @@ ifeq ($(USE_FAST_LOG),false)
 	BUILD_CPPFLAGS    +=-D_USE_FAST_LOG_=0
 endif
 
-ifeq ($(USE_GCOV),true)
-	BUILD_CFLAGS      += --coverage
-	BUILD_CPPFLAGS    += --coverage
-	BUILD_LDFLAGS     += --coverage
-endif
-
-ifeq ($(USE_PROFILER),true)
-	BUILD_CFLAGS      += -pg
-	BUILD_CPPFLAGS    += -pg
-	BUILD_LDFLAGS     += -pg
-endif
-
 ifeq ($(USE_YAMD),true)
 	CC                = yamd-gcc
 endif
@@ -935,7 +923,7 @@ ifeq ($(CC),$(GCC))
 		-fno-inline-functions-called-once \
 		-fno-tree-loop-optimize \
 		-fno-early-inlining \
-		-no-default-inline
+		-fno-default-inline
 else
   ifeq ($(CC),$(CLANG))
 	BUILD_CFLAGS      += -Werror
diff --git a/make/profiler-defs.mk b/make/profiler-defs.mk
index 6267368b..235a9876 100644
--- a/make/profiler-defs.mk
+++ b/make/profiler-defs.mk
@@ -12,11 +12,13 @@ ifeq ($(USE_GPROF),true)
 clean: clean.gprof
 endif
 
-ifeq ($(USE_GCOV),true)
-  PROJECT_CPPFLAGS     += -fprofile-arcs -ftest-coverage
-  PROJECT_CFLAGS       += -fprofile-arcs -ftest-coverage
-  PROJECT_LDFLAGS      += -fprofile-arcs -ftest-coverage
-clean: clean.gcov
+ifeq ($(COMPILER_SUITE),gcc)
+  ifeq ($(USE_GCOV),true)
+    PROJECT_CPPFLAGS     += -fprofile-arcs -ftest-coverage
+    PROJECT_CFLAGS       += -fprofile-arcs -ftest-coverage
+    PROJECT_LDFLAGS      += -fprofile-arcs -ftest-coverage
+  clean: clean.gcov
+  endif
 endif
 
 ifeq ($(COMPILER_SUITE),clang)