diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-04-04 12:26:46 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2011-04-04 12:27:29 +0200 |
| commit | 80414dab55296100b5421d2f93e23e7e209b38ba (patch) | |
| tree | 4bc8d37334c48a0de3d011e740e57f1f1c207290 /elf | |
| parent | 9876bf8a49b82b2f09592f9bd314aafb6c258420 (diff) | |
| parent | 1f8ebe02f006aaf1315c9ffc67b3d9ddf3123272 (diff) | |
| download | glibc-80414dab55296100b5421d2f93e23e7e209b38ba.tar.gz glibc-80414dab55296100b5421d2f93e23e7e209b38ba.tar.xz glibc-80414dab55296100b5421d2f93e23e7e209b38ba.zip | |
Merge remote-tracking branch 'origin/roland/systemtap' into fedora/master
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 3 | ||||
| -rw-r--r-- | elf/rtld-Rules | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/elf/Makefile b/elf/Makefile index 259a241550..41ad20b32f 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -479,7 +479,8 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS) -CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),-DNOT_IN_libc=1 -DIS_IN_rtld=1) +CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\ + -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld) test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) generated += $(addsuffix .so,$(strip $(modules-names))) diff --git a/elf/rtld-Rules b/elf/rtld-Rules index cd83c85235..c040b2f135 100644 --- a/elf/rtld-Rules +++ b/elf/rtld-Rules @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. # Copyright (C) 2002,2003,2005,2006,2008,2010,2011 -# Free Software Foundation, Inc. +# Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -131,6 +131,6 @@ ifdef rtld-depfiles endif # This here is the whole point of all the shenanigans. -rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld endif |