diff options
author | Andreas Schwab <schwab@redhat.com> | 2010-03-09 15:47:50 +0100 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2010-03-09 15:47:50 +0100 |
commit | 35be409292e2aaab331d21d2bc42ed4c44477281 (patch) | |
tree | df56d1f09cc5c8aca42b2be2af61f775f25a5b23 /elf | |
parent | 7bea85290bebde69cfb5aa057afb70e019154b4d (diff) | |
parent | 462a5227b0d3220ab68f65272bd5b9d6d4f49b1f (diff) |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'elf')
-rw-r--r-- | elf/dl-load.c | 14 | ||||
-rw-r--r-- | elf/elf.h | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index 597193c043..e8c7be55f7 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1,5 +1,5 @@ /* Map in a shared object's segments from the file. - Copyright (C) 1995-2005, 2006, 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 1995-2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -313,7 +313,7 @@ static char * expand_dynamic_string_token (struct link_map *l, const char *s) { /* We make two runs over the string. First we determine how large the - resulting string is and then we copy it over. Since this is now + resulting string is and then we copy it over. Since this is no frequently executed operation we are looking here not for performance but rather for code size. */ size_t cnt; @@ -391,7 +391,7 @@ fillin_rpath (char *rpath, struct r_search_path_elem **result, const char *sep, size_t len = strlen (cp); /* `strsep' can pass an empty string. This has to be - interpreted as `use the current directory'. */ + interpreted as `use the current directory'. */ if (len == 0) { static const char curwd[] = "./"; @@ -1519,7 +1519,7 @@ cannot enable executable stack as shared object requires"); /* Print search path. */ static void print_search_path (struct r_search_path_elem **list, - const char *what, const char *name) + const char *what, const char *name) { char buf[max_dirnamelen + max_capstrlen]; int first = 1; @@ -2044,7 +2044,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, fd = -1; /* When the object has the RUNPATH information we don't use any - RPATHs. */ + RPATHs. */ if (loader == NULL || loader->l_info[DT_RUNPATH] == NULL) { /* This is the executable's map (if there is one). Make sure that @@ -2067,7 +2067,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, } /* If dynamically linked, try the DT_RPATH of the executable - itself. NB: we do this for lookups in any namespace. */ + itself. NB: we do this for lookups in any namespace. */ if (fd == -1 && !did_main_map && main_map != NULL && main_map->l_type != lt_loaded && cache_rpath (main_map, &main_map->l_rpath_dirs, DT_RPATH, @@ -2164,7 +2164,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, /* Add another newline when we are tracing the library loading. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0)) - _dl_debug_printf ("\n"); + _dl_debug_printf ("\n"); } else { @@ -619,6 +619,7 @@ typedef struct #define NT_PPC_VSX 0x102 /* PowerPC VSX registers */ #define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */ #define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=deny) */ +#define NT_X86_XSTATE 0x202 /* x86 extended state using xsave */ /* Legal values for the note segment descriptor types for object files. */ @@ -2665,7 +2666,9 @@ typedef Elf32_Addr Elf32_Conflict; #define R_X86_64_GOTOFF64 25 /* 64 bit offset to GOT */ #define R_X86_64_GOTPC32 26 /* 32 bit signed pc relative offset to GOT */ -/* 27 .. 33 */ +/* 27 .. 31 */ +#define R_X86_64_SIZE32 32 /* Size of symbol plus 32-bit addend */ +#define R_X86_64_SIZE64 33 /* Size of symbol plus 64-bit addend */ #define R_X86_64_GOTPC32_TLSDESC 34 /* GOT offset for TLS descriptor. */ #define R_X86_64_TLSDESC_CALL 35 /* Marker for call through TLS descriptor. */ |