diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-06-24 22:42:26 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-06-24 22:42:26 +0000 |
| commit | f42fd2771adb82cb5f34ba9e80a607975111da48 (patch) | |
| tree | 43eebf12baba0fbee7c6277021c2ac924f76237c /libc/elf | |
| parent | 3625809e03b7287e244a6a2563d5217426e88d5c (diff) | |
Merge changes between r23296 and r23363 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@23364 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/elf')
| -rw-r--r-- | libc/elf/dl-dst.h | 13 | ||||
| -rw-r--r-- | libc/elf/rtld-Rules | 34 |
2 files changed, 22 insertions, 25 deletions
diff --git a/libc/elf/dl-dst.h b/libc/elf/dl-dst.h index 20b68d90b..3ed95d02d 100644 --- a/libc/elf/dl-dst.h +++ b/libc/elf/dl-dst.h @@ -55,7 +55,6 @@ First get the origin string if it is not available yet. \ This can only happen for the map of the executable or, when \ auditing, in ld.so. */ \ - DL_DST_REQ_STATIC (l) \ if ((l)->l_origin == NULL) \ { \ assert ((l)->l_name[0] == '\0' || IS_RTLD (l)); \ @@ -73,15 +72,3 @@ } \ \ __len; }) - -#ifdef SHARED -# define DL_DST_REQ_STATIC(l) /* nothing */ -#else -# define DL_DST_REQ_STATIC(l) \ - if ((l) == NULL) \ - { \ - const char *origin = _dl_get_origin (); \ - dst_len = (origin && origin != (char *) -1 ? strlen (origin) : 0); \ - } \ - else -#endif diff --git a/libc/elf/rtld-Rules b/libc/elf/rtld-Rules index f11dbe079..1aa00060b 100644 --- a/libc/elf/rtld-Rules +++ b/libc/elf/rtld-Rules @@ -88,29 +88,39 @@ else # Some other subdir's Makefile has provided all its normal rules, # and we just provide some additional definitions. +rtld-compile-command.S = $(compile-command.S) $(rtld-CPPFLAGS) +rtld-compile-command.s = $(compile-command.s) $(rtld-CPPFLAGS) +rtld-compile-command.c = $(compile-command.c) $(rtld-CPPFLAGS) + # These are the basic compilation rules corresponding to the Makerules ones. # The sysd-rules generated makefile already defines pattern rules for rtld-% # targets built from sysdeps source files. $(objpfx)rtld-%.os: rtld-%.S $(before-compile) - $(compile-command.S) $(rtld-CPPFLAGS) + $(rtld-compile-command.S) $(objpfx)rtld-%.os: rtld-%.s $(before-compile) - $(compile-command.s) $(rtld-CPPFLAGS) + $(rtld-compile-command.s) $(objpfx)rtld-%.os: rtld-%.c $(before-compile) - $(compile-command.c) $(rtld-CPPFLAGS) + $(rtld-compile-command.c) $(objpfx)rtld-%.os: %.S $(before-compile) - $(compile-command.S) $(rtld-CPPFLAGS) + $(rtld-compile-command.S) $(objpfx)rtld-%.os: %.s $(before-compile) - $(compile-command.s) $(rtld-CPPFLAGS) + $(rtld-compile-command.s) $(objpfx)rtld-%.os: %.c $(before-compile) - $(compile-command.c) $(rtld-CPPFLAGS) + $(rtld-compile-command.c) # The rules for generated source files. -$(objpfx)rtld-%.os: $(objpfx)rtld-%.S $(before-compile); $(compile-command.S) -$(objpfx)rtld-%.os: $(objpfx)rtld-%.s $(before-compile); $(compile-command.s) -$(objpfx)rtld-%.os: $(objpfx)rtld-%.c $(before-compile); $(compile-command.c) -$(objpfx)rtld-%.os: $(objpfx)%.S $(before-compile); $(compile-command.S) -$(objpfx)rtld-%.os: $(objpfx)%.s $(before-compile); $(compile-command.s) -$(objpfx)rtld-%.os: $(objpfx)%.c $(before-compile); $(compile-command.c) +$(objpfx)rtld-%.os: $(objpfx)rtld-%.S $(before-compile) + $(rtld-compile-command.S) +$(objpfx)rtld-%.os: $(objpfx)rtld-%.s $(before-compile) + $(rtld-compile-command.s) +$(objpfx)rtld-%.os: $(objpfx)rtld-%.c $(before-compile) + $(rtld-compile-command.c) +$(objpfx)rtld-%.os: $(objpfx)%.S $(before-compile) + $(rtld-compile-command.S) +$(objpfx)rtld-%.os: $(objpfx)%.s $(before-compile) + $(rtld-compile-command.s) +$(objpfx)rtld-%.os: $(objpfx)%.c $(before-compile) + $(rtld-compile-command.c) # The command line setting of rtld-modules (see above) tells us # what we need to build, and that tells us what dependency files we need. |