diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index 61e4d85d58e456334c0b4f9495808ab16e443920..c31c4e17ec2005f6fe496020182d4f757ca1a2d0 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -87,7 +87,7 @@ libarch$(LIBEXT): $(OBJS)
 	done ; )
 
 nuttx$(EXEEXT): $(LINKOBJS)
-	@echo "LD: nuttx$(EXEEXT)"
+	@echo "LD:  nuttx$(EXEEXT)"
 	@$(CC) $(LDFLAGS) $(LDPATHES) -o $(TOPDIR)/$@ $(LINKOBJS) \
 		-Wl,--start-group $(LDLIBS) -Wl,--end-group $(EXTRA_LIBS)
 	@$(NM) $(TOPDIR)/$@ | \
diff --git a/include/nuttx/compiler.h b/include/nuttx/compiler.h
index 318a7f137a0d77192e77672b4c41d1cc23190063..0fb08f5a399e32b3e202805754c0ff2eabecfdcf 100644
--- a/include/nuttx/compiler.h
+++ b/include/nuttx/compiler.h
@@ -295,6 +295,8 @@
 
 #else
 
+# undef  CONFIG_CPP_HAVE_VARARGS
+# undef  CONFIG_HAVE_FUNCTIONNAME
 # undef  CONFIG_HAVE_WEAKFUNCTIONS
 # define weak_alias(name, aliasname)
 # define weak_function