diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-19 12:13:54 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-19 12:13:54 +0530 |
| commit | 9cd4747089e6b0d6ed6b2b6c75798912489c7bab (patch) | |
| tree | b8804d1fcbe700d16978f82cb76aa8a5bbcf8544 /elf | |
| parent | d71035bd9a3a1dc5077ab8d978398f2f960d3555 (diff) | |
| download | glibc-9cd4747089e6b0d6ed6b2b6c75798912489c7bab.tar glibc-9cd4747089e6b0d6ed6b2b6c75798912489c7bab.tar.gz glibc-9cd4747089e6b0d6ed6b2b6c75798912489c7bab.tar.bz2 glibc-9cd4747089e6b0d6ed6b2b6c75798912489c7bab.zip | |
Add new macro IN_MODULE to identify module in which source is built
The current scheme to identify which module a translation unit is
built in depends on defining multiple macros IS_IN_* and also defining
NOT_IN_libc if we're building a non-libc module. In addition, there
is an IN_LIB macro that does effectively the same thing, but for
different modules (notably the systemtap probes). This macro scheme
unifies both ideas to use just one macro IN_MODULE and assign it a
value depending on the module it is being built into. If the module
is not defined, it defaults to MODULE_libc.
Patches that follow will replace uses of IS_IN_* variables with the
IS_IN() macro. libc-symbols.h has been converted already to give an
example of how such a transition will look.
Verified that there are no relevant binary changes. One source change
that will crop up repeatedly is that of nscd_stat, since it uses the
build timestamp as a constant in its logic.
* Makeconfig (in-module): Get value of libof set for the
translation unit.
(CPPFLAGS): Use $(in-module).
* Makerules: Don't suffix routine names for nonlib.
* include/libc-modules.h: New file.
* include/libc-symbols.h: Include libc-modules.h
(IS_IN): New macro to replace IS_IN_* macros.
* elf/Makefile: Set libof-* for each routine.
* elf/rtld-Rules: Likewise.
* extra-modules.mk: Likewise.
* iconv/Makefile: Likewise.
* iconvdata/Makefile: Likewise.
* locale/Makefile: Likewise.
* malloc/Makefile: Likewise.
* nss/Makefile: Likewise.
* sysdeps/gnu/Makefile: Likewise.
* sysdeps/ieee754/ldbl-opt/Makefile: Likewise.
* sysdeps/unix/sysv/linux/Makefile: Likewise.
* sysdeps/s390/s390-64/Makefile: Likewise.
* nscd/Makefile: Set libof-* for each routine. Set CFLAGS and
CPPFLAGS for nscd instead of nonlib.
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 7 | ||||
| -rw-r--r-- | elf/rtld-Rules | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/elf/Makefile b/elf/Makefile index 34f0b1fb83..f013c22d67 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -436,7 +436,8 @@ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 + -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 -DNOT_IN_libc=1 +libof-ldconfig = ldconfig CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS) CFLAGS-rtld.c = $(SYSCONF-FLAGS) @@ -444,6 +445,10 @@ CFLAGS-rtld.c = $(SYSCONF-FLAGS) CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\ -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld) +cpp-srcs-left := $(all-rtld-routines:=.os) +lib := rtld +include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) + 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 0a5d6afade..f2cc4a1b8d 100644 --- a/elf/rtld-Rules +++ b/elf/rtld-Rules @@ -138,6 +138,11 @@ ifdef rtld-depfiles -include $(rtld-depfiles) endif +# Set libof-* for each routine. +cpp-srcs-left := $(rtld-modules:%.os=%) +lib := rtld +include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) + # This here is the whole point of all the shenanigans. rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld |