Small cleanup in Makeconfig.

diff --git a/ChangeLog b/ChangeLog
index 13c3530..7ddd56b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-01  Marek Polacek  <polacek@redhat.com>
+
+       * libc/Makeconfig: Use elf in place of binfmt-subdir.
+       Use dlfcn directly instead of a variable.
+       (binfmt-subdir): Do not define.
+       (dlfcn): Likewise.
+
 2012-08-01  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_FCNTL64):

diff --git a/Makeconfig b/Makeconfig
index 859b588..10df8ee 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -89,10 +89,6 @@ uses-callbacks = $(exceptions)
 # What flags to give to tests which test stack alignment
 stack-align-test-flags =
 
-# We have a special subdir for each binary format.
-# For now, only ELF is fully supported.
-binfmt-subdir = elf
-
 # Complete path to sysdep dirs.
 # `configure' writes a definition of `config-sysdirs' in `config.make'.
 sysdirs := $(foreach D,$(config-sysdirs),$(firstword $(filter /%,$D) $(..)$D))
@@ -955,7 +951,6 @@ endif
 endif # build-shared
 
 
-dlfcn = dlfcn
 ifeq ($(build-shared),yes)
 libdl = $(common-objpfx)dlfcn/libdl.so$(libdl.so-version)
 else
@@ -976,7 +971,7 @@ all-subdirs = csu assert ctype locale intl catgets math setjmp signal           \
              grp pwd posix io termios resource misc socket sysvipc gmon    \
              gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
              crypt nss localedata timezone rt conform debug                \
-             $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
+             $(add-on-subdirs) dlfcn elf
 
 ifndef avoid-generated
 all-Depend-files := $(wildcard $(foreach dir,$(all-subdirs),\