diff options
author | Roland McGrath <roland@gnu.org> | 2001-05-14 23:32:39 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2001-05-14 23:32:39 +0000 |
commit | 083973f34e1c70e05e117db37239716995127cfd (patch) | |
tree | 1cbd8c5608a168b06bc8d8a8278cf0a9ab08e08e /sysdeps | |
parent | aefdff34cd2669d3bb3824a759ce0322ed7e2ef2 (diff) | |
download | glibc-083973f34e1c70e05e117db37239716995127cfd.zip glibc-083973f34e1c70e05e117db37239716995127cfd.tar.gz glibc-083973f34e1c70e05e117db37239716995127cfd.tar.bz2 |
* csu/Makefile ($(objpfx)g$(start-installed-name)): Turn this into a
static pattern rule also that also covers
$(objpx)g$(static-start-installed-name).
[$(start-installed-name) != $(static-start-installed-name)]
(extra-objs, omit-deps, install-lib): Add
$(static-start-installed-name) and g$(static-start-installed-name).
* sysdeps/mach/hurd/i386/Makefile: Don't add crt0.o to those here;
just setting static-start-installed-name is now sufficient.
(extra-objs): Add static-start.o here.
(CFLAGS-initfini.s): Remove obsolete variable.
* sysdeps/mach/hurd/i386/Makeconfig: New file.
Define static-start-installed-name here.
* Makeconfig: Include existing $(full_config_sysdirs:=/Makeconfig).
* Make-dist (+sysdep-tsrcs): Look for Makeconfig files.
* Makerules ($(+sysdir_pfx)sysd-Makefile): Remove this target and
associated hair. Instead, just use $(wildcard ...) in the include.
* configure.in (critic_missing, aux_missing): Collect in these vars
the names of the missing programs, and include them in the error msgs.
* configure: Regenerated.
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/mach/hurd/i386/Makeconfig | 4 | ||||
-rw-r--r-- | sysdeps/mach/hurd/i386/Makefile | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/sysdeps/mach/hurd/i386/Makeconfig b/sysdeps/mach/hurd/i386/Makeconfig new file mode 100644 index 0000000..1b65bb0 --- /dev/null +++ b/sysdeps/mach/hurd/i386/Makeconfig @@ -0,0 +1,4 @@ +# We need special startup code for statically linked binaries. +# See Makefile in this directory for the rule that builds this. +# We must define this variable earlier than sysdeps Makefiles are included. +static-start-installed-name = crt0.o diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile index 335324e..b3c619a 100644 --- a/sysdeps/mach/hurd/i386/Makefile +++ b/sysdeps/mach/hurd/i386/Makefile @@ -1,18 +1,9 @@ -# We need special startup code for statically linked binaries. -static-start-installed-name = crt0.o - ifeq ($(subdir),csu) -extra-objs += crt0.o -install-lib += crt0.o -omit-deps += crt0 +extra-objs += static-start.o + +# We need special startup code for statically linked binaries. $(objpfx)crt0.o: $(objpfx)static-start.o $(objpfx)abi-note.o $(objpfx)init.o $(link-relocatable) -# compat for libc.so.0.2 only -# This is needed to be backward-compatible with glibc-2.0.x startup code -# that was miscompiled so that it jumps to 0 if there is a nonzero -# __gmon_start__ symbol, but works if there is none. -CFLAGS-initfini.s += -DWEAK_GMON_START - endif |