You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/05/02 02:34:35 UTC
[incubator-nuttx-apps] branch master updated: examples: Replace all
-luc with -lc
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new cfe030d examples: Replace all -luc with -lc
cfe030d is described below
commit cfe030db40537b0761c476c3a8751746c4d45bed
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Apr 30 20:30:28 2020 +0800
examples: Replace all -luc with -lc
follow up the kernel side change
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
examples/elf/tests/errno/Makefile | 4 ----
examples/elf/tests/hello/Makefile | 4 ----
examples/elf/tests/helloxx/Makefile | 4 ----
examples/elf/tests/longjmp/Makefile | 4 ----
examples/elf/tests/mutex/Makefile | 4 ----
examples/elf/tests/pthread/Makefile | 4 ----
examples/elf/tests/signal/Makefile | 4 ----
examples/elf/tests/struct/Makefile | 4 ----
examples/elf/tests/task/Makefile | 4 ----
examples/module/drivers/chardev/Makefile | 1 -
examples/sotest/lib/modprint/Makefile | 4 ----
examples/sotest/lib/sotest/Makefile | 4 ----
12 files changed, 45 deletions(-)
diff --git a/examples/elf/tests/errno/Makefile b/examples/elf/tests/errno/Makefile
index 7d71462..8bb6ba3 100644
--- a/examples/elf/tests/errno/Makefile
+++ b/examples/elf/tests/errno/Makefile
@@ -55,12 +55,8 @@ endif
endif
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_BUILD_PROTECTED),y)
-LDLIBS += -luc
-else
LDLIBS += -lc
endif
-endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
LDLIBS += -lproxies
diff --git a/examples/elf/tests/hello/Makefile b/examples/elf/tests/hello/Makefile
index 4de917b..1766afd 100644
--- a/examples/elf/tests/hello/Makefile
+++ b/examples/elf/tests/hello/Makefile
@@ -55,12 +55,8 @@ endif
endif
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_BUILD_PROTECTED),y)
-LDLIBS += -luc
-else
LDLIBS += -lc
endif
-endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
LDLIBS += -lproxies
diff --git a/examples/elf/tests/helloxx/Makefile b/examples/elf/tests/helloxx/Makefile
index 578e360..4f29898 100644
--- a/examples/elf/tests/helloxx/Makefile
+++ b/examples/elf/tests/helloxx/Makefile
@@ -55,12 +55,8 @@ endif
endif
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_BUILD_PROTECTED),y)
-LDLIBS += -luc
-else
LDLIBS += -lc
endif
-endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
LDLIBS += -lproxies
diff --git a/examples/elf/tests/longjmp/Makefile b/examples/elf/tests/longjmp/Makefile
index 7dab95f..7521ab8 100644
--- a/examples/elf/tests/longjmp/Makefile
+++ b/examples/elf/tests/longjmp/Makefile
@@ -55,12 +55,8 @@ endif
endif
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_BUILD_PROTECTED),y)
-LDLIBS += -luc
-else
LDLIBS += -lc
endif
-endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
LDLIBS += -lproxies
diff --git a/examples/elf/tests/mutex/Makefile b/examples/elf/tests/mutex/Makefile
index a3fc20e..ce4114b 100644
--- a/examples/elf/tests/mutex/Makefile
+++ b/examples/elf/tests/mutex/Makefile
@@ -55,12 +55,8 @@ endif
endif
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_BUILD_PROTECTED),y)
-LDLIBS += -luc
-else
LDLIBS += -lc
endif
-endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
LDLIBS += -lproxies
diff --git a/examples/elf/tests/pthread/Makefile b/examples/elf/tests/pthread/Makefile
index aeeab1d..f741250 100644
--- a/examples/elf/tests/pthread/Makefile
+++ b/examples/elf/tests/pthread/Makefile
@@ -55,12 +55,8 @@ endif
endif
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_BUILD_PROTECTED),y)
-LDLIBS += -luc
-else
LDLIBS += -lc
endif
-endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
LDLIBS += -lproxies
diff --git a/examples/elf/tests/signal/Makefile b/examples/elf/tests/signal/Makefile
index 17cc43c..d9acd2c 100644
--- a/examples/elf/tests/signal/Makefile
+++ b/examples/elf/tests/signal/Makefile
@@ -55,12 +55,8 @@ endif
endif
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_BUILD_PROTECTED),y)
-LDLIBS += -luc
-else
LDLIBS += -lc
endif
-endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
LDLIBS += -lproxies
diff --git a/examples/elf/tests/struct/Makefile b/examples/elf/tests/struct/Makefile
index 6652e77..4245d0c 100644
--- a/examples/elf/tests/struct/Makefile
+++ b/examples/elf/tests/struct/Makefile
@@ -57,12 +57,8 @@ endif
endif
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_BUILD_PROTECTED),y)
-LDLIBS += -luc
-else
LDLIBS += -lc
endif
-endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
LDLIBS += -lproxies
diff --git a/examples/elf/tests/task/Makefile b/examples/elf/tests/task/Makefile
index 1324f66..f95898c 100644
--- a/examples/elf/tests/task/Makefile
+++ b/examples/elf/tests/task/Makefile
@@ -55,12 +55,8 @@ endif
endif
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
-ifeq ($(CONFIG_BUILD_PROTECTED),y)
-LDLIBS += -luc
-else
LDLIBS += -lc
endif
-endif
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
LDLIBS += -lproxies
diff --git a/examples/module/drivers/chardev/Makefile b/examples/module/drivers/chardev/Makefile
index 43fd59b..f1f9c70 100644
--- a/examples/module/drivers/chardev/Makefile
+++ b/examples/module/drivers/chardev/Makefile
@@ -44,7 +44,6 @@ else
NUTTXLIB = "$(TOPDIR)$(DELIM)staging"
endif
-KDEFINE = ${shell $(DEFINE) "$(CC)" __KERNEL__}
CMODULEFLAGS += $(KDEFINE)
LDLIBPATH =
diff --git a/examples/sotest/lib/modprint/Makefile b/examples/sotest/lib/modprint/Makefile
index 510965b..f198729 100644
--- a/examples/sotest/lib/modprint/Makefile
+++ b/examples/sotest/lib/modprint/Makefile
@@ -61,12 +61,8 @@ LDLIBPATH += -L $(NUTTXLIB)
endif
ifeq ($(CONFIG_EXAMPLES_SOTEST_LIBC),y)
-ifeq ($(CONFIG_BUILD_PROTECTED),y)
-LDLIBS += -luc
-else
LDLIBS += -lc
endif
-endif
BIN = modprint
diff --git a/examples/sotest/lib/sotest/Makefile b/examples/sotest/lib/sotest/Makefile
index cdf286b..5b36ab1 100644
--- a/examples/sotest/lib/sotest/Makefile
+++ b/examples/sotest/lib/sotest/Makefile
@@ -61,12 +61,8 @@ LDLIBPATH += -L $(NUTTXLIB)
endif
ifeq ($(CONFIG_EXAMPLES_SOTEST_LIBC),y)
-ifeq ($(CONFIG_BUILD_PROTECTED),y)
-LDLIBS += -luc
-else
LDLIBS += -lc
endif
-endif
BIN = sotest