diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 9f0f17cc89..e4ba4c189a 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -1358,7 +1358,7 @@ libc/
|-- dirent/
| `-- (Implementation of functions from dirent.h)
|-- dllfch/
-| `-- (Implementation of functions from dllfcn.h)
+| `-- (Implementation of functions from dlfcn.h)
|-- fixedmath/
| `-- (Implementation of functions from fixedmath.h)
|-- hex2bin/
diff --git a/configs/olimex-stm32-p407/README.txt b/configs/olimex-stm32-p407/README.txt
index 7e4e215ec3..b179f37e06 100644
--- a/configs/olimex-stm32-p407/README.txt
+++ b/configs/olimex-stm32-p407/README.txt
@@ -482,7 +482,7 @@ must be is one of the following.
FLAT build using apps/examples/sotest (assuming that you also have SD
card support enabled and that the SD card is mount at /mnt/sdcard):
- CONFIG_LIBC_DLLFCN=y
+ CONFIG_LIBC_DLFCN=y
CONFIG_EXAMPLES_SOTEST=y
CONFIG_EXAMPLES_SOTEST_BINDIR="/mnt/sdcard"
@@ -538,7 +538,7 @@ must be is one of the following.
Add the following for testing shared libraries in the FLAT
build:
- CONFIG_LIBC_DLLFCN=y
+ CONFIG_LIBC_DLFCN=y
CONFIG_EXAMPLES_SOTEST=y
CONFIG_EXAMPLES_SOTEST_BUILTINFS=y
CONFIG_EXAMPLES_SOTEST_DEVMINOR=1
diff --git a/configs/samv71-xult/README.txt b/configs/samv71-xult/README.txt
index a7f830a4b7..fb3f3a29ab 100644
--- a/configs/samv71-xult/README.txt
+++ b/configs/samv71-xult/README.txt
@@ -1838,7 +1838,7 @@ Configuration sub-directories
Add the following for testing shared libraries in the FLAT
build:
- CONFIG_LIBC_DLLFCN=y
+ CONFIG_LIBC_DLFCN=y
CONFIG_EXAMPLES_SOTEST=y
CONFIG_EXAMPLES_SOTEST_BINDIR="/mnt/sdcard"
diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt
index c36044fe94..32dd2b939e 100644
--- a/configs/stm32f4discovery/README.txt
+++ b/configs/stm32f4discovery/README.txt
@@ -1660,7 +1660,7 @@ Configuration Sub-directories
FLAT build using apps/examples/sotest (assuming that you also have SD
card support enabled and that the SD card is mount at /mnt/sdcard):
- CONFIG_LIBC_DLLFCN=y
+ CONFIG_LIBC_DLFCN=y
CONFIG_EXAMPLES_SOTEST=y
CONFIG_EXAMPLES_SOTEST_BINDIR="/mnt/sdcard"
diff --git a/include/dllfcn.h b/include/dlfcn.h
similarity index 98%
rename from include/dllfcn.h
rename to include/dlfcn.h
index cbf1d445ed..f06311f6ad 100644
--- a/include/dllfcn.h
+++ b/include/dlfcn.h
@@ -1,7 +1,7 @@
/****************************************************************************
- * include/dllfcn.h
+ * include/dlfcn.h
*
- * Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2017, 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __INCLUDE_DLLFCN_H
-#define __INCLUDE_DLLFCN_H
+#ifndef __INCLUDE_DLFCN_H
+#define __INCLUDE_DLFCN_H
/****************************************************************************
* Included Files
@@ -329,4 +329,4 @@ FAR char *dlerror(void);
}
#endif
-#endif /* __INCLUDE_DLLFCN_H */
+#endif /* __INCLUDE_DLFCN_H */
diff --git a/libs/libc/Kconfig b/libs/libc/Kconfig
index 5ea76af695..1f7943f7b9 100644
--- a/libs/libc/Kconfig
+++ b/libs/libc/Kconfig
@@ -11,7 +11,7 @@ source libs/libc/machine/Kconfig
source libs/libc/stdlib/Kconfig
source libs/libc/unistd/Kconfig
source libs/libc/string/Kconfig
-source libs/libc/dllfcn/Kconfig
+source libs/libc/dlfcn/Kconfig
source libs/libc/modlib/Kconfig
source libs/libc/wchar/Kconfig
source libs/libc/locale/Kconfig
diff --git a/libs/libc/Makefile b/libs/libc/Makefile
index ccc8ece955..d7e14baacc 100644
--- a/libs/libc/Makefile
+++ b/libs/libc/Makefile
@@ -56,7 +56,7 @@ VPATH := .
include aio/Make.defs
include audio/Make.defs
include dirent/Make.defs
-include dllfcn/Make.defs
+include dlfcn/Make.defs
include endian/Make.defs
include fixedmath/Make.defs
include hex2bin/Make.defs
diff --git a/libs/libc/README.txt b/libs/libc/README.txt
index c7127893e0..28896dd81f 100644
--- a/libs/libc/README.txt
+++ b/libs/libc/README.txt
@@ -29,7 +29,7 @@ in the include/ directory provides the prototype for library functions. So
we have:
audio - This part of the audio system: nuttx/audio/audio.h
- dllfcn - dllfcn.h
+ dlfcn - dlfcn.h
endian - endian.h
hex2bin - hex2bin.h
libgen - libgen.h
diff --git a/libs/libc/dllfcn/Kconfig b/libs/libc/dlfcn/Kconfig
similarity index 95%
rename from libs/libc/dllfcn/Kconfig
rename to libs/libc/dlfcn/Kconfig
index ff4bce968c..fd4b3b3ec7 100644
--- a/libs/libc/dllfcn/Kconfig
+++ b/libs/libc/dlfcn/Kconfig
@@ -5,7 +5,7 @@
# menu "Shared Library Support"
-config LIBC_DLLFCN
+config LIBC_DLFCN
bool "Shared library support"
default n
select LIBC_MODLIB if !BUILD_FLAT
@@ -16,7 +16,7 @@ config LIBC_DLLFCN
A work in progress, hence, marked EXPERIMENTAL
-if LIBC_DLLFCN
+if LIBC_DLFCN
config LDPATH_INITIAL
string "Initial LD_LIBRARY_PATH Value"
diff --git a/libs/libc/dllfcn/Make.defs b/libs/libc/dlfcn/Make.defs
similarity index 90%
rename from libs/libc/dllfcn/Make.defs
rename to libs/libc/dlfcn/Make.defs
index 2967883ffa..23fcdd6c79 100644
--- a/libs/libc/dllfcn/Make.defs
+++ b/libs/libc/dlfcn/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# libs/libc/dllfcn/Make.defs
+# libs/libc/dlfcn/Make.defs
#
# Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt
@@ -33,15 +33,15 @@
#
############################################################################
-ifeq ($(CONFIG_LIBC_DLLFCN),y)
+ifeq ($(CONFIG_LIBC_DLFCN),y)
-# Add the dllfcn.h files to the build
+# Add the dlfcn.h files to the build
CSRCS += lib_dlopen.c lib_dlclose.c lib_dlsym.c lib_dlerror.c lib_dlsymtab.c
-# Add the dllfcn.h directory to the build
+# Add the dlfcn.h directory to the build
-DEPPATH += --dep-path dllfcn
-VPATH += :dllfcn
+DEPPATH += --dep-path dlfcn
+VPATH += :dlfcn
endif
diff --git a/libs/libc/dllfcn/lib_dlclose.c b/libs/libc/dlfcn/lib_dlclose.c
similarity index 99%
rename from libs/libc/dllfcn/lib_dlclose.c
rename to libs/libc/dlfcn/lib_dlclose.c
index c5b3cc495d..8737c9306a 100644
--- a/libs/libc/dllfcn/lib_dlclose.c
+++ b/libs/libc/dlfcn/lib_dlclose.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/dllfcn/lib_dlclose.c
+ * libs/libc/dlfcn/lib_dlclose.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -39,7 +39,7 @@
#include
-#include
+#include
#include
#include
diff --git a/libs/libc/dllfcn/lib_dlerror.c b/libs/libc/dlfcn/lib_dlerror.c
similarity index 98%
rename from libs/libc/dllfcn/lib_dlerror.c
rename to libs/libc/dlfcn/lib_dlerror.c
index 3abbae7f38..7c2335683f 100644
--- a/libs/libc/dllfcn/lib_dlerror.c
+++ b/libs/libc/dlfcn/lib_dlerror.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/dllfcn/lib_dlerror.c
+ * libs/libc/dlfcn/lib_dlerror.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -40,7 +40,7 @@
#include
#include
-#include
+#include
#include
/****************************************************************************
diff --git a/libs/libc/dllfcn/lib_dlopen.c b/libs/libc/dlfcn/lib_dlopen.c
similarity index 99%
rename from libs/libc/dllfcn/lib_dlopen.c
rename to libs/libc/dlfcn/lib_dlopen.c
index 2e1c020f34..905266ab8f 100644
--- a/libs/libc/dllfcn/lib_dlopen.c
+++ b/libs/libc/dlfcn/lib_dlopen.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/dllfcn/lib_dlopen.c
+ * libs/libc/dlfcn/lib_dlopen.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -42,7 +42,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/libs/libc/dllfcn/lib_dlsym.c b/libs/libc/dlfcn/lib_dlsym.c
similarity index 99%
rename from libs/libc/dllfcn/lib_dlsym.c
rename to libs/libc/dlfcn/lib_dlsym.c
index 4f4a792c46..b70252f45a 100644
--- a/libs/libc/dllfcn/lib_dlsym.c
+++ b/libs/libc/dlfcn/lib_dlsym.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/dllfcn/lib_dlsym.c
+ * libs/libc/dlfcn/lib_dlsym.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -39,7 +39,7 @@
#include
-#include
+#include
#include
#include
diff --git a/libs/libc/dllfcn/lib_dlsymtab.c b/libs/libc/dlfcn/lib_dlsymtab.c
similarity index 98%
rename from libs/libc/dllfcn/lib_dlsymtab.c
rename to libs/libc/dlfcn/lib_dlsymtab.c
index be0334ae02..68ca34598e 100644
--- a/libs/libc/dllfcn/lib_dlsymtab.c
+++ b/libs/libc/dlfcn/lib_dlsymtab.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/dllfcn/lib_symtab.c
+ * libs/libc/dlfcn/lib_symtab.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -39,7 +39,7 @@
#include
-#include
+#include
#include
#include
diff --git a/tools/cfgdefine.c b/tools/cfgdefine.c
index ec5d815482..5edd26de0b 100644
--- a/tools/cfgdefine.c
+++ b/tools/cfgdefine.c
@@ -66,7 +66,7 @@ static const char *dequote_list[] =
"CONFIG_USER_ENTRYPOINT", /* Name of entry point function */
"CONFIG_EXECFUNCS_SYMTAB_ARRAY", /* Symbol table array used by exec[l|v] */
"CONFIG_EXECFUNCS_NSYMBOLS_VAR", /* Variable holding number of symbols in the table */
- "CONFIG_MODLIB_SYMTAB_ARRAY", /* Symbol table array used by dllfcn[l|v] */
+ "CONFIG_MODLIB_SYMTAB_ARRAY", /* Symbol table array used by modlib functions */
"CONFIG_MODLIB_NSYMBOLS_VAR", /* Variable holding number of symbols in the table */
"CONFIG_PASS1_BUILDIR", /* Pass1 build directory */
"CONFIG_PASS1_TARGET", /* Pass1 build target */