lib/glibc
lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-05-30 04:04:54 +03:00
Code

Move rules for Linux-specific pldd program to Linux-specific Makefile.

Browse Source
This commit is contained in:
Roland McGrath 2014-05-05 13:16:08 -07:00
parent eb1ed03daf
commit fe6588457a
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2014-05-05 Roland McGrath <roland@hack.frob.com> 2014-05-05 Roland McGrath <roland@hack.frob.com>
* elf/Makefile (others, install-bin): Remove pldd.
(pldd-modules): Variable removed.
($(objpfx)pldd): Target removed.
* sysdeps/unix/sysv/linux/Makefile [$(subdir) = elf]
(others, install-bin): Append pldd here.
($(objpfx)pldd): New target.
* sysdeps/gnu/errlist.awk (BEGIN): Emit an initial #define of ERR_MAX * sysdeps/gnu/errlist.awk (BEGIN): Emit an initial #define of ERR_MAX
to 0, so the first #if test emitted later doesn't see it undefined. to 0, so the first #if test emitted later doesn't see it undefined.
(END): Emit "!defined ERRLIST_NO_COMPAT" to match what BEGIN does. (END): Emit "!defined ERRLIST_NO_COMPAT" to match what BEGIN does.

8
elf/Makefile
View File

@ -70,8 +70,8 @@ install-others = $(inst_rtlddir)/$(rtld-installed-name)
install-bin-script = ldd install-bin-script = ldd
endif endif
others = sprof sln pldd others = sprof sln
install-bin = sprof pldd install-bin = sprof
others-static = sln others-static = sln
install-rootsbin = sln install-rootsbin = sln
sln-modules := static-stubs sln-modules := static-stubs
@ -88,8 +88,6 @@ extra-objs += $(ldconfig-modules:=.o)
endif endif
endif endif
pldd-modules := xmalloc
# To find xmalloc.c and xstrdup.c # To find xmalloc.c and xstrdup.c
vpath %.c ../locale/programs vpath %.c ../locale/programs
@ -430,8 +428,6 @@ $(objpfx)sln: $(sln-modules:%=$(objpfx)%.o)
$(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
$(objpfx)pldd: $(pldd-modules:%=$(objpfx)%.o)
SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
-D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1

4
sysdeps/unix/sysv/linux/Makefile
View File

@ -175,6 +175,10 @@ sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64 dl-opendir \
dl-fxstatat64 dl-fxstatat64
CPPFLAGS-lddlibc4 += -DNOT_IN_libc CPPFLAGS-lddlibc4 += -DNOT_IN_libc
others += pldd
install-bin += pldd
$(objpfx)pldd: $(objpfx)xmalloc.o
endif endif
ifeq ($(subdir),rt) ifeq ($(subdir),rt)