diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-12-27 14:48:14 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-12-27 14:48:14 +0000 |
| commit | 64cd3e83c9993f3c1a3c24ea3030a22ccf35e12d (patch) | |
| tree | 8808fad08bb8677b0e0d2158c65096eae5484767 /elf | |
| parent | e3173d2c996d8e30dfe44e9bf530881da6df6aaa (diff) | |
| download | glibc-64cd3e83c9993f3c1a3c24ea3030a22ccf35e12d.tar.gz glibc-64cd3e83c9993f3c1a3c24ea3030a22ccf35e12d.tar.xz glibc-64cd3e83c9993f3c1a3c24ea3030a22ccf35e12d.zip | |
Updated to fedora-glibc-20051227T1426
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/cache.c | 4 | ||||
| -rw-r--r-- | elf/chroot_canon.c | 6 | ||||
| -rw-r--r-- | elf/dl-error.c | 2 | ||||
| -rw-r--r-- | elf/dl-lookup.c | 2 | ||||
| -rw-r--r-- | elf/ldconfig.c | 6 | ||||
| -rw-r--r-- | elf/readlib.c | 4 | ||||
| -rw-r--r-- | elf/rtld.c | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/elf/cache.c b/elf/cache.c index 9ce3d161a7..c13918ccb4 100644 --- a/elf/cache.c +++ b/elf/cache.c @@ -30,8 +30,8 @@ #include <sys/stat.h> #include <sys/types.h> -#include "ldconfig.h" -#include "dl-cache.h" +#include <ldconfig.h> +#include <dl-cache.h> struct cache_entry { diff --git a/elf/chroot_canon.c b/elf/chroot_canon.c index 41d6e82625..3ef2fdf08f 100644 --- a/elf/chroot_canon.c +++ b/elf/chroot_canon.c @@ -1,6 +1,6 @@ /* Return the canonical absolute name of a given file inside chroot. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1996,1997,1998,1999,2000,2001,2004,2005 + Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -26,7 +26,7 @@ #include <stddef.h> #include <stdint.h> -#include "ldconfig.h" +#include <ldconfig.h> #ifndef PATH_MAX #define PATH_MAX 1024 diff --git a/elf/dl-error.c b/elf/dl-error.c index b5374e949c..79ebaaf01b 100644 --- a/elf/dl-error.c +++ b/elf/dl-error.c @@ -113,7 +113,7 @@ _dl_signal_error (int errcode, const char *objname, const char *occation, lcatch->malloced = false; } /* We do not restore the signal mask because none was saved. */ - __longjmp (lcatch->env, errcode ?: -1); + __longjmp (lcatch->env[0].__jmpbuf, errcode ?: -1); } else { diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 130453ca24..5a7bed16e5 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -23,7 +23,7 @@ #include <string.h> #include <unistd.h> #include <ldsodefs.h> -#include "dl-hash.h" +#include <dl-hash.h> #include <dl-machine.h> #include <bits/libc-lock.h> #include <tls.h> diff --git a/elf/ldconfig.c b/elf/ldconfig.c index e63b312bd0..e5a931913f 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -37,10 +37,10 @@ #include <glob.h> #include <libgen.h> -#include "ldconfig.h" -#include "dl-cache.h" +#include <ldconfig.h> +#include <dl-cache.h> -#include "dl-procinfo.h" +#include <dl-procinfo.h> #ifdef _DL_FIRST_PLATFORM # define _DL_FIRST_EXTRA (_DL_FIRST_PLATFORM + _DL_PLATFORMS_COUNT) diff --git a/elf/readlib.c b/elf/readlib.c index 65c8e9d65d..8896bbdaca 100644 --- a/elf/readlib.c +++ b/elf/readlib.c @@ -34,7 +34,7 @@ #include <sys/stat.h> #include <gnu/lib-names.h> -#include "ldconfig.h" +#include <ldconfig.h> #define Elf32_CLASS ELFCLASS32 #define Elf64_CLASS ELFCLASS64 @@ -178,4 +178,4 @@ process_file (const char *real_file_name, const char *file_name, } /* Get architecture specific version of process_elf_file. */ -#include "readelflib.c" +#include <readelflib.c> diff --git a/elf/rtld.c b/elf/rtld.c index aee3ea9a2a..71bcf0ab71 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -34,7 +34,7 @@ #include <hp-timing.h> #include <bits/libc-lock.h> #include "dynamic-link.h" -#include "dl-librecon.h" +#include <dl-librecon.h> #include <unsecvars.h> #include <dl-cache.h> #include <dl-osinfo.h> |