diff options
| author | Roland McGrath <roland@gnu.org> | 2008-01-30 00:24:16 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2008-01-30 00:24:16 +0000 |
| commit | 16cd816fd04bd3982c5333c2df76c88e39031522 (patch) | |
| tree | b5f21deb153bc5f4e60aa1bc235b9d123d121543 /elf | |
| parent | f641ffccd8cdad83f403fe44e14ab0748c8bb39a (diff) | |
| download | glibc-16cd816fd04bd3982c5333c2df76c88e39031522.tar.gz glibc-16cd816fd04bd3982c5333c2df76c88e39031522.tar.xz glibc-16cd816fd04bd3982c5333c2df76c88e39031522.zip | |
* Makeconfig (sysd-rules-patterns): New variable.
* Makerules ($(common-objpfx)sysd-rules): Drive the loop from that. (check-inhibit-asm): New canned sequence, replaces ... (open-check-inhibit-asm, close-check-inhibit-asm): ... these, removed. * elf/rtld-Rules ($(objpfx)rtld-%.os): Use $(rtld-CPPFLAGS) in commands. (rtld-CPPFLAGS): Renamed from CPPFLAGS-rtld. (CFLAGS-rtld): Variable removed.
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/rtld-Rules | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/elf/rtld-Rules b/elf/rtld-Rules index 01fbbdf0c5..9f31a560e5 100644 --- a/elf/rtld-Rules +++ b/elf/rtld-Rules @@ -1,6 +1,6 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker. -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2008 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 @@ -93,9 +93,12 @@ else # 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: %.S $(before-compile); $(compile-command.S) -$(objpfx)rtld-%.os: %.s $(before-compile); $(compile-command.s) -$(objpfx)rtld-%.os: %.c $(before-compile); $(compile-command.c) +$(objpfx)rtld-%.os: %.S $(before-compile) + $(compile-command.S) $(rtld-CPPFLAGS) +$(objpfx)rtld-%.os: %.s $(before-compile) + $(compile-command.s) $(rtld-CPPFLAGS) +$(objpfx)rtld-%.os: %.c $(before-compile) + $(compile-command.c) $(rtld-CPPFLAGS) # The rules for generated source files. $(objpfx)rtld-%.os: $(objpfx)%.S $(before-compile); $(compile-command.S) @@ -118,16 +121,7 @@ ifdef rtld-depfiles -include $(rtld-depfiles) endif -# Just in case we wind up e.g. regenerating dependencies for non-rtld objects, -# we don't unconditionally modify the flags. For rtld-% targets, use the -# special flags set below. -CFLAGS += $(if $(filter rtld-%,$(@F)),$(CFLAGS-rtld)) -CPPFLAGS += $(if $(filter rtld-%,$(@F)),$(CPPFLAGS-rtld)) - - # This here is the whole point of all the shenanigans. -CPPFLAGS-rtld := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -CFLAGS-rtld := # blah - +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 endif |