aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
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 /sysdeps
parentabf7063390f46bd484d00c6a2d103a52cf058bd6 (diff)
downloadglibc-7884bf473e94661b2f1fe4250e8b6987e5965245.zip
glibc-7884bf473e94661b2f1fe4250e8b6987e5965245.tar.gz
glibc-7884bf473e94661b2f1fe4250e8b6987e5965245.tar.bz2
* 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 'sysdeps')
-rw-r--r--sysdeps/i386/dl-machine.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 3044edf..1f787a5 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -60,14 +60,16 @@ elf_machine_load_address (void)
return addr;
}
-#ifndef PROF
+#if !defined PROF && !__BOUNDED_POINTERS__
/* We add a declaration of this function here so that in dl-runtime.c
the ELF_MACHINE_RUNTIME_TRAMPOLINE macro really can pass the parameters
in registers.
We cannot use this scheme for profiling because the _mcount call
destroys the passed register information. */
-static ElfW(Addr) fixup (struct link_map *l, ElfW(Word) reloc_offset)
+/* GKM FIXME: Fix trampoline to pass bounds so we can do
+ without the `__unbounded' qualifier. */
+static ElfW(Addr) fixup (struct link_map *__unbounded l, ElfW(Word) reloc_offset)
__attribute__ ((regparm (2), unused));
static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset,
ElfW(Addr) retaddr)
@@ -119,7 +121,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
/* This code is used in dl-runtime.c to call the `fixup' function
and then redirect to the address it returns. */
-#ifndef PROF
+#if !defined PROF && !__BOUNDED_POINTERS__
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
.text
.globl _dl_runtime_resolve