aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2012-08-02 00:11:39 +0200
committerMarek Polacek <polacek@redhat.com>2012-08-02 00:11:39 +0200
commit3fb791b889fc80556274a856e642ca6186c18926 (patch)
tree671af8ed643cc3e3aa28e9adb0bcc560b4300e04
parent23bddc0668391d97710f7d10c8cb04dc305112ea (diff)
downloadglibc-3fb791b889fc80556274a856e642ca6186c18926.zip
glibc-3fb791b889fc80556274a856e642ca6186c18926.tar.gz
glibc-3fb791b889fc80556274a856e642ca6186c18926.tar.bz2
Small cleanup in Makeconfig.
-rw-r--r--ChangeLog7
-rw-r--r--Makeconfig7
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 13c3530..7ddd56b 100644
--- 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
--- 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),\