You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/05/12 15:12:43 UTC
[incubator-nuttx-apps] branch master updated (725fe76b9 -> 59fc69c45)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
from 725fe76b9 trace: format the usage output
new 5ee2e6348 Use -fno-builtin for SYMTABOBJ
new 6a2589856 Revert "tools/mksymtab.sh: Disable the mismatch warning of builtin declaration"
new adf7ceedf examples/elf: -fno-builtin for a file generated by mksymtab.sh
new 8e6081abe examples/module: -fno-builtin for a file generated by mksymtab.sh
new b7f57a195 examples/posix_spawn: -fno-builtin for a file generated by mksymtab.sh
new dc9103a72 examples/nxflat: -fno-builtin for a file generated by mksymtab.sh
new 4b383b397 examples/sotest: -fno-builtin for a file generated by mksymtab.sh
new 59fc69c45 examples/thttpd: -fno-builtin for a file generated by mksymtab.sh
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile | 2 +-
examples/elf/Makefile | 2 ++
examples/module/Makefile | 2 ++
examples/nxflat/Makefile | 2 ++
examples/posix_spawn/Makefile | 2 ++
examples/sotest/Makefile | 2 ++
examples/thttpd/Makefile | 2 ++
tools/mksymtab.sh | 5 -----
8 files changed, 13 insertions(+), 6 deletions(-)
[incubator-nuttx-apps] 08/08: examples/thttpd: -fno-builtin for a file generated by mksymtab.sh
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 59fc69c453de1ffc26017b69571fe3f52d9163f7
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Wed Apr 6 14:07:51 2022 +0900
examples/thttpd: -fno-builtin for a file generated by mksymtab.sh
---
examples/thttpd/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/examples/thttpd/Makefile b/examples/thttpd/Makefile
index 4b4050904..6ad986674 100644
--- a/examples/thttpd/Makefile
+++ b/examples/thttpd/Makefile
@@ -31,6 +31,8 @@ ifeq ($(CONFIG_THTTPD_BINFS),y)
else
CONTENT_MAKE += -f Makefile.nxflat
CSRCS += symtab.c
+ content$(DELIM)symtab.c_CFLAGS = -fno-builtin
+ content$(DELIM)symtab.c_CELFFLAGS = -fno-builtin
endif
PROGNAME = thttp
[incubator-nuttx-apps] 01/08: Use -fno-builtin for SYMTABOBJ
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 5ee2e6348f0b0cb9b57d449410e7e75d47bc81b1
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Wed Apr 6 12:24:16 2022 +0900
Use -fno-builtin for SYMTABOBJ
The code generated by tools/mksymtab.sh uses
```
extern void *var;
```
for ~everything.
After the recent removal of -fno-builtin, [1]
it ends up with warnings:
* -Wbuiltin-requires-header for clang
* -Wbuiltin-declaration-mismatch for gcc
It also generates errors like the following for clang:
```
symtab_apps.c:125:14: error: redefinition of 'strdup' as different kind of symbol
extern void *strdup;
```
I couldn't find a way to disable it.
(it's err_redefinition_different_kind in clang source)
This commit works it around by restoring -fno-builtin
when building SYMTABOBJ.
[1] https://github.com/apache/incubator-nuttx/pull/5476
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index f33a9cffc..e6ddb1633 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ $(SYMTABSRC): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
$(SYMTABOBJ): %$(OBJEXT): %.c
- $(call COMPILE, -fno-lto $<, $@)
+ $(call COMPILE, -fno-lto -fno-builtin $<, $@)
$(BIN): $(SYMTABOBJ)
$(call ARCHIVE_ADD, $(call CONVERT_PATH,$(BIN)), $^)
[incubator-nuttx-apps] 04/08: examples/module: -fno-builtin for a file generated by mksymtab.sh
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 8e6081abe03d0497bc432d836fc1a0bbcf1968ac
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Wed Apr 6 14:02:33 2022 +0900
examples/module: -fno-builtin for a file generated by mksymtab.sh
---
examples/module/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/examples/module/Makefile b/examples/module/Makefile
index 3b6c8a9f8..1a3c51356 100644
--- a/examples/module/Makefile
+++ b/examples/module/Makefile
@@ -36,6 +36,8 @@ ifeq ($(CONFIG_EXAMPLES_MODULE_CROMFS),y)
CSRCS = cromfs.c
endif
CSRCS += mod_symtab.c
+drivers$(DELIM)mod_symtab.c_CFLAGS = -fno-builtin
+drivers$(DELIM)mod_symtab.c_CELFFLAGS = -fno-builtin
MAINSRC = module_main.c
VPATH += drivers
[incubator-nuttx-apps] 03/08: examples/elf: -fno-builtin for a file generated by mksymtab.sh
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit adf7ceedf4aed2017079175636a03314d6be636e
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Wed Apr 6 14:00:48 2022 +0900
examples/elf: -fno-builtin for a file generated by mksymtab.sh
---
examples/elf/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/examples/elf/Makefile b/examples/elf/Makefile
index 1ddfb60d6..0d17c8a1c 100644
--- a/examples/elf/Makefile
+++ b/examples/elf/Makefile
@@ -30,6 +30,8 @@ CSRCS = cromfs.c
endif
CSRCS += dirlist.c
CSRCS += symtab.c
+tests$(DELIM)symtab.c_CFLAGS = -fno-builtin
+tests$(DELIM)symtab.c_CELFFLAGS = -fno-builtin
MAINSRC = elf_main.c
PROGNAME = elf
[incubator-nuttx-apps] 02/08: Revert "tools/mksymtab.sh: Disable the mismatch warning of builtin declaration"
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 6a25898568acd19be4670bdddf1561b2def4c607
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Wed Apr 6 12:31:21 2022 +0900
Revert "tools/mksymtab.sh: Disable the mismatch warning of builtin declaration"
This reverts commit a6773a8412400adf703ad6f9dd3fa3e6d7402245.
Unnecessary after "Use -fno-builtin for SYMTABOBJ"
---
tools/mksymtab.sh | 5 -----
1 file changed, 5 deletions(-)
diff --git a/tools/mksymtab.sh b/tools/mksymtab.sh
index cfdd6ff95..9275945eb 100755
--- a/tools/mksymtab.sh
+++ b/tools/mksymtab.sh
@@ -57,11 +57,6 @@ echo "#include <nuttx/compiler.h>"
echo "#include <nuttx/symtab.h>"
echo ""
-echo "#if defined(__GNUC__) && !defined(__clang__)"
-echo "# pragma GCC diagnostic ignored \"-Wbuiltin-declaration-mismatch\""
-echo "#endif"
-echo ""
-
for string in $varlist; do
var=`echo $string | sed -e "s/\"//g"`
echo "extern void *${var};"
[incubator-nuttx-apps] 06/08: examples/nxflat: -fno-builtin for a file generated by mksymtab.sh
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit dc9103a72d3c1aa3d5f5b658b1187523e58999fd
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Wed Apr 6 14:05:21 2022 +0900
examples/nxflat: -fno-builtin for a file generated by mksymtab.sh
---
examples/nxflat/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/examples/nxflat/Makefile b/examples/nxflat/Makefile
index 934c3f5c6..db78b8349 100644
--- a/examples/nxflat/Makefile
+++ b/examples/nxflat/Makefile
@@ -25,6 +25,8 @@ include $(APPDIR)/Make.defs
CSRCS = romfs.c
CSRCS += dirlist.c
CSRCS += symtab.c
+tests$(DELIM)symtab.c_CFLAGS = -fno-builtin
+tests$(DELIM)symtab.c_CELFFLAGS = -fno-builtin
MAINSRC = nxflat_main.c
PROGNAME = nxflat
[incubator-nuttx-apps] 07/08: examples/sotest: -fno-builtin for a file generated by mksymtab.sh
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 4b383b397d5f5398d392ea84e2c6388b0bf09289
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Wed Apr 6 14:06:31 2022 +0900
examples/sotest: -fno-builtin for a file generated by mksymtab.sh
---
examples/sotest/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/examples/sotest/Makefile b/examples/sotest/Makefile
index 250455108..f7a0690e8 100644
--- a/examples/sotest/Makefile
+++ b/examples/sotest/Makefile
@@ -33,6 +33,8 @@ ifeq ($(CONFIG_EXAMPLES_SOTEST_BUILTINFS),y)
CSRCS = romfs.c
endif
CSRCS += sot_symtab.c
+lib$(DELIM)sot_symtab.c_CFLAGS = -fno-builtin
+lib$(DELIM)sot_symtab.c_CELFFLAGS = -fno-builtin
MAINSRC = sotest_main.c
DEPPATH += --dep-path lib
[incubator-nuttx-apps] 05/08: examples/posix_spawn: -fno-builtin for a file generated by mksymtab.sh
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit b7f57a1952a1016049db78d8f0cce5ab53d798c8
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Wed Apr 6 14:03:56 2022 +0900
examples/posix_spawn: -fno-builtin for a file generated by mksymtab.sh
---
examples/posix_spawn/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/examples/posix_spawn/Makefile b/examples/posix_spawn/Makefile
index 2e5aa7b58..312d04378 100644
--- a/examples/posix_spawn/Makefile
+++ b/examples/posix_spawn/Makefile
@@ -24,6 +24,8 @@ include $(APPDIR)/Make.defs
CSRCS = romfs.c
CSRCS += symtab.c
+filesystem$(DELIM)symtab.c_CFLAGS = -fno-builtin
+filesystem$(DELIM)symtab.c_CELFFLAGS = -fno-builtin
MAINSRC = spawn_main.c
PROGNAME = posix_spawn