From e39e69563a5046efc5ffb0385364fb0bc1095c43 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 7 Sep 2000 21:34:51 +0000 Subject: [PATCH] Update. * elf/Makefile (all-rtld-routines): Evaluate $(sysdep-rtld-routines) too. * sysdeps/powerpc/Makefile (sysdep-rtld-routines): New variable. (sysdep_routines): Remove dl-start. Patches by Franz Sirl . --- ChangeLog | 6 ++++++ elf/Makefile | 2 +- sysdeps/powerpc/Makefile | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 356e51fb60..d1231a7dac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2000-09-07 Ulrich Drepper + * elf/Makefile (all-rtld-routines): Evaluate $(sysdep-rtld-routines) + too. + * sysdeps/powerpc/Makefile (sysdep-rtld-routines): New variable. + (sysdep_routines): Remove dl-start. + Patches by Franz Sirl . + * assert/__assert.c: Undefine NDEBUG before include . * sysdeps/unix/sysv/linux/msgsnd.c (msgsnd): Add cast to avoid warning. diff --git a/elf/Makefile b/elf/Makefile index ab71adf3c2..2932183028 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -36,7 +36,7 @@ elide-routines.os = $(all-dl-routines) dl-support enbl-secure # ld.so uses those routines, plus some special stuff for being the program # interpreter and operating independent of libc. rtld-routines := rtld $(dl-routines) dl-sysdep dl-environ dl-minimal -all-rtld-routines = $(rtld-routines) $(sysdep-dl-routines) +all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines) distribute := $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \ dl-cache.h dl-hash.h soinit.c sofini.c ldd.bash.in \ diff --git a/sysdeps/powerpc/Makefile b/sysdeps/powerpc/Makefile index 67ea942c94..ef5d33eaf9 100644 --- a/sysdeps/powerpc/Makefile +++ b/sysdeps/powerpc/Makefile @@ -41,6 +41,9 @@ CFLAGS-memcmp.c += -Wno-uninitialized endif ifeq ($(subdir),elf) +# extra shared linker files to link into dl-allobjs.so and libc sysdep-dl-routines += dl-machine -sysdep_routines += dl-machine dl-start +sysdep_routines += dl-machine +# extra shared linker files to link only into dl-allobjs.so +sysdep-rtld-routines += dl-machine dl-start endif -- 2.43.5