summary refs log tree commit diff
path: root/elf/dl-runtime.c
diff options
context:
space:
mode:
authorGreg McGary <greg@mcgary.org>2000-07-18 00:13:34 +0000
committerGreg McGary <greg@mcgary.org>2000-07-18 00:13:34 +0000
commit7884bf473e94661b2f1fe4250e8b6987e5965245 (patch)
treed4dfb4adacc99a35c33dac69b03f8ea4c11f1c18 /elf/dl-runtime.c
parentabf7063390f46bd484d00c6a2d103a52cf058bd6 (diff)
downloadglibc-7884bf473e94661b2f1fe4250e8b6987e5965245.tar.gz
glibc-7884bf473e94661b2f1fe4250e8b6987e5965245.tar.xz
glibc-7884bf473e94661b2f1fe4250e8b6987e5965245.zip
* elf/dl-runtime.c (fixup): Trampoline passes unbounded pointer.
(profile_fixup): Don't define for __BOUNDED_POINTERS__. 
* sysdeps/i386/dl-machine.h: Don't use regparm attribute for 
__BOUNDED_POINTERS__. 
(ELF_MACHINE_RUNTIME_TRAMPOLINE): Use non-regparm version 
for __BOUNDED_POINTERS__.
	* iconv/gconv_trans.c: Add #include <stdlib.h> to get malloc decl.

	* elf/dl-runtime.c (fixup): Trampoline passes unbounded pointer.
	(profile_fixup): Don't define for __BOUNDED_POINTERS__.
	* sysdeps/i386/dl-machine.h: Don't use regparm attribute for
	__BOUNDED_POINTERS__.
	(ELF_MACHINE_RUNTIME_TRAMPOLINE): Use non-regparm version
	for __BOUNDED_POINTERS__.
Diffstat (limited to 'elf/dl-runtime.c')
-rw-r--r--elf/dl-runtime.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index cb38dfe9d0..bff27e721e 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -47,7 +47,9 @@ fixup (
 # ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
         ELF_MACHINE_RUNTIME_FIXUP_ARGS,
 # endif
-       struct link_map *l, ElfW(Word) reloc_offset)
+	/* GKM FIXME: Fix trampoline to pass bounds so we can do
+	   without the `__unbounded' qualifier.  */
+       struct link_map *__unbounded l, ElfW(Word) reloc_offset)
 {
   const ElfW(Sym) *const symtab
     = (const void *) D_PTR (l, l_info[DT_SYMTAB]);
@@ -119,7 +121,7 @@ fixup (
 }
 #endif
 
-#if !defined PROF && !defined ELF_MACHINE_NO_PLT
+#if !defined PROF && !defined ELF_MACHINE_NO_PLT && !__BOUNDED_POINTERS__
 
 static ElfW(Addr) __attribute__ ((unused))
 profile_fixup (