[PATCH] Small cleanup in Makeconfig

[Marek Polacek]

On Wed, Aug 01, 2012 at 02:21:50PM -0700, Roland McGrath wrote:
> Yes, that's fine.  While you're at it, remove the dlfcn variable.

Ok, thanks.  This is what I'm going to install.  Regtested x86_64.

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.

--- libc/Makeconfig.mp4	2012-08-01 15:53:03.111393158 +0200
+++ libc/Makeconfig	2012-08-01 23:36:45.611003377 +0200
@@ -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 in
 	      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),\

	Marek