Deleted Added
full compact
rtld.h (216695) rtld.h (217153)
1/*-
2 * Copyright 1996, 1997, 1998, 1999, 2000 John D. Polstra.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 8 unchanged lines hidden (view full) ---

17 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
1/*-
2 * Copyright 1996, 1997, 1998, 1999, 2000 John D. Polstra.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 8 unchanged lines hidden (view full) ---

17 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
25 * $FreeBSD: head/libexec/rtld-elf/rtld.h 216695 2010-12-25 08:51:20Z kib $
25 * $FreeBSD: head/libexec/rtld-elf/rtld.h 217153 2011-01-08 17:11:49Z kib $
26 */
27
28#ifndef RTLD_H /* { */
29#define RTLD_H 1
30
31#include <machine/elf.h>
32#include <sys/types.h>
33#include <sys/queue.h>

--- 118 unchanged lines hidden (view full) ---

152 size_t textsize; /* Size of text segment in bytes */
153 Elf_Addr vaddrbase; /* Base address in shared object file */
154 caddr_t relocbase; /* Relocation constant = mapbase - vaddrbase */
155 const Elf_Dyn *dynamic; /* Dynamic section */
156 caddr_t entry; /* Entry point */
157 const Elf_Phdr *phdr; /* Program header if it is mapped, else NULL */
158 size_t phsize; /* Size of program header in bytes */
159 const char *interp; /* Pathname of the interpreter, if any */
26 */
27
28#ifndef RTLD_H /* { */
29#define RTLD_H 1
30
31#include <machine/elf.h>
32#include <sys/types.h>
33#include <sys/queue.h>

--- 118 unchanged lines hidden (view full) ---

152 size_t textsize; /* Size of text segment in bytes */
153 Elf_Addr vaddrbase; /* Base address in shared object file */
154 caddr_t relocbase; /* Relocation constant = mapbase - vaddrbase */
155 const Elf_Dyn *dynamic; /* Dynamic section */
156 caddr_t entry; /* Entry point */
157 const Elf_Phdr *phdr; /* Program header if it is mapped, else NULL */
158 size_t phsize; /* Size of program header in bytes */
159 const char *interp; /* Pathname of the interpreter, if any */
160 Elf_Word stack_flags;
160
161 /* TLS information */
162 int tlsindex; /* Index in DTV for this module */
163 void *tlsinit; /* Base address of TLS init block */
164 size_t tlsinitsize; /* Size of TLS init block for this module */
165 size_t tlssize; /* Size of TLS block for this module */
166 size_t tlsoffset; /* Offset of static TLS block for this module */
167 size_t tlsalign; /* Alignment of static TLS block */

--- 170 unchanged lines hidden ---
161
162 /* TLS information */
163 int tlsindex; /* Index in DTV for this module */
164 void *tlsinit; /* Base address of TLS init block */
165 size_t tlsinitsize; /* Size of TLS init block for this module */
166 size_t tlssize; /* Size of TLS block for this module */
167 size_t tlsoffset; /* Offset of static TLS block for this module */
168 size_t tlsalign; /* Alignment of static TLS block */

--- 170 unchanged lines hidden ---