summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nuttx/arch/sim/src/Makefile2
-rw-r--r--nuttx/include/nuttx/compiler.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/nuttx/arch/sim/src/Makefile b/nuttx/arch/sim/src/Makefile
index 61e4d85d5..c31c4e17e 100644
--- a/nuttx/arch/sim/src/Makefile
+++ b/nuttx/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/nuttx/include/nuttx/compiler.h b/nuttx/include/nuttx/compiler.h
index 318a7f137..0fb08f5a3 100644
--- a/nuttx/include/nuttx/compiler.h
+++ b/nuttx/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