Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Include .interp section only for libc.so
Barring libc.so and libdl.so, none of the libraries have any entry
points, so it is pointless to add a .interp section for them.  The
libdl.so entry point (in dlfcn/eval.c) is also defunct, so remove that
file as well.

Build tested for x86_64, ppc64 and s390x.  I have not moved
CFLAGS-interp.c to CPPFLAGS-interp.c isnce I'll be removing it
completely in a follow-up patch.

Siddhesh

	* Makerules (lib%.so): Don't include $(+interp) in
	prerequisites.
	* elf/Makefile (CFLAGS-interp.c): Don't define NOT_IN_libc.
	* dlfcn/eval.c: Remove file.
  • Loading branch information
Siddhesh Poyarekar committed Sep 16, 2014
1 parent 653b108 commit 02657da
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 203 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
@@ -1,5 +1,10 @@
2014-09-16 Siddhesh Poyarekar <siddhesh@redhat.com>

* Makerules (lib%.so): Don't include $(+interp) in
prerequisites.
* elf/Makefile (CFLAGS-interp.c): Don't define NOT_IN_libc.
* dlfcn/eval.c: Remove file.

* posix/getconf.c (vars): Don't check for _[SP]C_* and _CS
macros.

Expand Down
2 changes: 1 addition & 1 deletion Makerules
Expand Up @@ -436,7 +436,7 @@ link-libc-deps = $(common-objpfx)libc.so $(common-objpfx)linkobj/libc.so \
# $(LDLIBS-%.so) may contain -l switches to generate run-time dependencies
# on other shared objects. The linking with libc and ld.so is intended
# to be as similar as possible to a default link with an installed libc.
lib%.so: lib%_pic.a $(+preinit) $(+postinit) $(+interp) $(link-libc-deps)
lib%.so: lib%_pic.a $(+preinit) $(+postinit) $(link-libc-deps)
$(build-shlib) $(link-libc-args)

define build-shlib-helper
Expand Down
200 changes: 0 additions & 200 deletions dlfcn/eval.c

This file was deleted.

3 changes: 1 addition & 2 deletions elf/Makefile
Expand Up @@ -354,8 +354,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map)
mv -f $@.new $@

# interp.c exists just to get this string into the libraries.
CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"' \
-DNOT_IN_libc=1
CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"'
$(objpfx)interp.os: $(common-objpfx)config.make

ifneq (ld.so,$(rtld-installed-name))
Expand Down

0 comments on commit 02657da

Please sign in to comment.