diff options
| author | markj <markj@FreeBSD.org> | 2014-05-07 17:21:22 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2014-05-07 17:21:22 +0000 |
| commit | 0315ad1bd3775fbc5ed2005c871a9b8da242ae58 (patch) | |
| tree | dfdb435ab0a397f493d19cfc4df80c49edc7794b /libexec | |
| parent | c1476c6e0a7edecd0b9a2d0bef6c82952a2ad780 (diff) | |
| download | FreeBSD-src-0315ad1bd3775fbc5ed2005c871a9b8da242ae58.zip FreeBSD-src-0315ad1bd3775fbc5ed2005c871a9b8da242ae58.tar.gz | |
- Export the function added in r265456 rather than the non-existent
_rtld_debug_postinit(). [1]
- Use __compiler_membar() instead of inline asm in _r_debug_state() and
_r_debug_postinit(). [2]
Pointy hat to: markj [1]
Reported by: attilio [2]
Discussed with: kib
X-MFC-With: r265456
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rtld-elf/Symbol.map | 2 | ||||
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libexec/rtld-elf/Symbol.map b/libexec/rtld-elf/Symbol.map index e82b1d4..5ea7d7e 100644 --- a/libexec/rtld-elf/Symbol.map +++ b/libexec/rtld-elf/Symbol.map @@ -30,5 +30,5 @@ FBSDprivate_1.0 { _rtld_atfork_post; _rtld_addr_phdr; _rtld_get_stack_prot; - _rtld_debug_postinit; + _r_debug_postinit; }; diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 72b312f..443767d 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3551,7 +3551,7 @@ r_debug_state(struct r_debug* rd, struct link_map *m) * even when marked __noinline. However, gdb depends on those * calls being made. */ - __asm __volatile("" : : : "memory"); + __compiler_membar(); } /* @@ -3564,7 +3564,7 @@ _r_debug_postinit(struct link_map *m) { /* See r_debug_state(). */ - __asm __volatile("" : : : "memory"); + __compiler_membar(); } /* |
