diff --git a/glibc-ldconfig-speedup.patch b/glibc-ldconfig-speedup.patch deleted file mode 100644 index 4d621af..0000000 --- a/glibc-ldconfig-speedup.patch +++ /dev/null @@ -1,1143 +0,0 @@ -2007-07-27 Andreas Jaeger - Jakub Jelinek - - * elf/ldconfig.c (opt_ignore_aux_cache): Add new option. - (options): Add option. - (parse_opt): Handle option. - (manual_link): Adjust process_file caller. Call implicit_soname. - (search_dir): Formatting. Use and populate auxiliary cache. - (main): Load and save auxiliary cache. - * elf/readlib.c (process_file): Add stat_buf argument. Pass struct - stat64 from fstat64 to caller. - (implicit_soname): New function. - * elf/readelflib.c (process_elf_file): If DT_SONAME is not present, - leave *soname as NULL. - * elf/cache.c: Include libgen.h. - (print_entry, print_cache, compare, save_cache, add_to_cache): - Formatting and cleanups. - (aux_cache_entry_id, aux_cache_entry, aux_cache_file_entry, - aux_cache_file): New structures. - (AUX_CACHEMAGIC): Define. - (primes): New array. - (aux_hash_size, aux_hash): New variables. - (aux_cache_entry_id_hash, nextprime, init_aux_cache, - search_aux_cache, insert_to_aux_cache, add_to_aux_cache, - load_aux_cache, save_aux_cache): New functions. - * sysdeps/generic/ldconfig.h (_PATH_LDCONFIG_AUX_CACHE): Define. - (init_aux_cache, search_aux_cache, add_to_aux_cache, - load_aux_cache, save_aux_cache, implicit_soname): New prototypes. - (process_file): Adjust prototype. - ---- libc/elf/readlib.c.jj 2007-07-16 09:58:46.000000000 +0200 -+++ libc/elf/readlib.c 2007-07-27 17:45:36.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1999-2003, 2005 Free Software Foundation, Inc. -+/* Copyright (C) 1999-2003, 2005, 2007 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Jaeger , 1999 and - Jakub Jelinek , 1999. -@@ -69,7 +69,7 @@ static struct known_names known_libs[] = - int - process_file (const char *real_file_name, const char *file_name, - const char *lib, int *flag, unsigned int *osversion, -- char **soname, int is_link) -+ char **soname, int is_link, struct stat64 *stat_buf) - { - FILE *file; - struct stat64 statbuf; -@@ -135,7 +135,7 @@ process_file (const char *real_file_name - ) - { - /* Aout files don't have a soname, just return the name -- including the major number. */ -+ including the major number. */ - char *copy, *major, *dot; - copy = xstrdup (lib); - major = strstr (copy, ".so."); -@@ -175,8 +175,31 @@ process_file (const char *real_file_name - munmap (file_contents, statbuf.st_size); - fclose (file); - -+ *stat_buf = statbuf; - return ret; - } - -+/* Returns made up soname if lib doesn't have explicit DT_SONAME. */ -+ -+char * -+implicit_soname (const char *lib, int flag) -+{ -+ char *soname = xstrdup (lib); -+ -+ if ((flag & FLAG_TYPE_MASK) != FLAG_LIBC4) -+ return soname; -+ -+ /* Aout files don't have a soname, just return the name -+ including the major number. */ -+ char *major = strstr (soname, ".so."); -+ if (major) -+ { -+ char *dot = strstr (major + 4, "."); -+ if (dot) -+ *dot = '\0'; -+ } -+ return soname; -+} -+ - /* Get architecture specific version of process_elf_file. */ - #include ---- libc/elf/readelflib.c.jj 2007-07-03 12:36:59.000000000 +0200 -+++ libc/elf/readelflib.c 2007-07-27 15:24:36.000000000 +0200 -@@ -231,11 +231,5 @@ process_elf_file (const char *file_name, - } - } - -- /* We reach this point only if the file doesn't contain a DT_SONAME -- or if we can't classify the library. If it doesn't have a -- soname, return the name of the library. */ -- if (*soname == NULL) -- *soname = xstrdup (lib); -- - return 0; - } ---- libc/elf/ldconfig.c.jj 2007-07-16 09:58:46.000000000 +0200 -+++ libc/elf/ldconfig.c 2007-07-27 18:07:32.000000000 +0200 -@@ -112,6 +112,9 @@ static char *opt_chroot; - /* Manually link given shared libraries. */ - static int opt_manual_link; - -+/* Should we ignore an old auxiliary cache file? */ -+static int opt_ignore_aux_cache; -+ - /* Cache file to use. */ - static char *cache_file; - -@@ -142,6 +145,7 @@ static const struct argp_option options[ - { NULL, 'n', NULL, 0, N_("Only process directories specified on the command line. Don't build cache."), 0}, - { NULL, 'l', NULL, 0, N_("Manually link individual libraries."), 0}, - { "format", 'c', N_("FORMAT"), 0, N_("Format to use: new, old or compat (default)"), 0}, -+ { "ignore-aux-cache", 'i', NULL, 0, N_("Ignore auxiliary cache file"), 0}, - { NULL, 0, NULL, 0, NULL, 0 } - }; - -@@ -238,10 +242,15 @@ parse_opt (int key, char *arg, struct ar - { - case 'C': - cache_file = arg; -+ /* Ignore auxiliary cache since we use non-standard cache. */ -+ opt_ignore_aux_cache = 1; - break; - case 'f': - config_file = arg; - break; -+ case 'i': -+ opt_ignore_aux_cache = 1; -+ break; - case 'l': - opt_manual_link = 1; - break; -@@ -518,7 +527,7 @@ manual_link (char *library) - if (libname) - { - /* Successfully split names. Check if path is just "/" to avoid -- an empty path. */ -+ an empty path. */ - if (libname == path) - { - libname = library + 1; -@@ -572,14 +581,17 @@ manual_link (char *library) - free (path); - return; - } -+ - if (process_file (real_library, library, libname, &flag, &osversion, -- &soname, 0)) -+ &soname, 0, &stat_buf)) - { - error (0, 0, _("No link created since soname could not be found for %s"), - library); - free (path); - return; - } -+ if (soname == NULL) -+ soname = implicit_soname (libname, flag); - create_links (real_path, path, libname, soname); - free (soname); - free (path); -@@ -625,23 +637,7 @@ struct dlib_entry - static void - search_dir (const struct dir_entry *entry) - { -- DIR *dir; -- struct dirent64 *direntry; -- char *file_name, *dir_name, *real_file_name, *real_name; -- int file_name_len, real_file_name_len, len; -- char *soname; -- struct dlib_entry *dlibs; -- struct dlib_entry *dlib_ptr; -- struct stat64 lstat_buf, stat_buf; -- int is_link, is_dir; - uint64_t hwcap = path_hwcap (entry->path); -- unsigned int osversion; -- -- file_name_len = PATH_MAX; -- file_name = alloca (file_name_len); -- -- dlibs = NULL; -- - if (opt_verbose) - { - if (hwcap != 0) -@@ -650,6 +646,11 @@ search_dir (const struct dir_entry *entr - printf ("%s:\n", entry->path); - } - -+ char *dir_name; -+ char *real_file_name; -+ size_t real_file_name_len; -+ size_t file_name_len = PATH_MAX; -+ char *file_name = alloca (file_name_len); - if (opt_chroot) - { - dir_name = chroot_canon (opt_chroot, entry->path); -@@ -663,6 +664,7 @@ search_dir (const struct dir_entry *entr - real_file_name = file_name; - } - -+ DIR *dir; - if (dir_name == NULL || (dir = opendir (dir_name)) == NULL) - { - if (opt_verbose) -@@ -672,6 +674,8 @@ search_dir (const struct dir_entry *entr - return; - } - -+ struct dirent64 *direntry; -+ struct dlib_entry *dlibs = NULL; - while ((direntry = readdir64 (dir)) != NULL) - { - int flag; -@@ -695,7 +699,8 @@ search_dir (const struct dir_entry *entr - #endif - !is_hwcap_platform (direntry->d_name))) - continue; -- len = strlen (direntry->d_name); -+ -+ size_t len = strlen (direntry->d_name); - /* Skip temporary files created by the prelink program. Files with - names like these are never really DSOs we want to look at. */ - if (len >= sizeof (".#prelink#") - 1) -@@ -727,7 +732,10 @@ search_dir (const struct dir_entry *entr - } - sprintf (real_file_name, "%s/%s", dir_name, direntry->d_name); - } -+ -+ struct stat64 lstat_buf; - #ifdef _DIRENT_HAVE_D_TYPE -+ /* We optimize and try to do the lstat call only if needed. */ - if (direntry->d_type != DT_UNKNOWN) - lstat_buf.st_mode = DTTOIF (direntry->d_type); - else -@@ -738,9 +746,11 @@ search_dir (const struct dir_entry *entr - continue; - } - -- is_link = S_ISLNK (lstat_buf.st_mode); -+ struct stat64 stat_buf; -+ int is_dir; -+ int is_link = S_ISLNK (lstat_buf.st_mode); - if (is_link) -- { -+ { - /* In case of symlink, we check if the symlink refers to - a directory. */ - if (__builtin_expect (stat64 (real_file_name, &stat_buf), 0)) -@@ -754,6 +764,12 @@ search_dir (const struct dir_entry *entr - continue; - } - is_dir = S_ISDIR (stat_buf.st_mode); -+ -+ /* lstat_buf is later stored, update contents. */ -+ lstat_buf.st_dev = stat_buf.st_dev; -+ lstat_buf.st_ino = stat_buf.st_ino; -+ lstat_buf.st_size = stat_buf.st_size; -+ lstat_buf.st_ctime = stat_buf.st_ctime; - } - else - is_dir = S_ISDIR (lstat_buf.st_mode); -@@ -767,36 +783,28 @@ search_dir (const struct dir_entry *entr - new_entry->path = xstrdup (file_name); - new_entry->flag = entry->flag; - new_entry->next = NULL; -- if (is_link) -+#ifdef _DIRENT_HAVE_D_TYPE -+ /* We have filled in lstat only #ifndef -+ _DIRENT_HAVE_D_TYPE. Fill it in if needed. */ -+ if (!is_link -+ && direntry->d_type != DT_UNKNOWN -+ && __builtin_expect (lstat64 (real_file_name, &lstat_buf), 0)) - { -- new_entry->ino = stat_buf.st_ino; -- new_entry->dev = stat_buf.st_dev; -+ error (0, errno, _("Cannot lstat %s"), file_name); -+ free (new_entry->path); -+ free (new_entry); -+ continue; - } -- else -- { --#ifdef _DIRENT_HAVE_D_TYPE -- /* We have filled in lstat only #ifndef -- _DIRENT_HAVE_D_TYPE. Fill it in if needed. */ -- if (direntry->d_type != DT_UNKNOWN -- && __builtin_expect (lstat64 (real_file_name, &lstat_buf), -- 0)) -- { -- error (0, errno, _("Cannot lstat %s"), file_name); -- free (new_entry->path); -- free (new_entry); -- continue; -- } - #endif -- -- new_entry->ino = lstat_buf.st_ino; -- new_entry->dev = lstat_buf.st_dev; -- } -+ new_entry->ino = lstat_buf.st_ino; -+ new_entry->dev = lstat_buf.st_dev; - add_single_dir (new_entry, 0); - continue; - } - else if (!S_ISREG (lstat_buf.st_mode) && !is_link) - continue; - -+ char *real_name; - if (opt_chroot && is_link) - { - real_name = chroot_canon (opt_chroot, file_name); -@@ -810,14 +818,36 @@ search_dir (const struct dir_entry *entr - else - real_name = real_file_name; - -- if (process_file (real_name, file_name, direntry->d_name, &flag, -- &osversion, &soname, is_link)) -+#ifdef _DIRENT_HAVE_D_TYPE -+ /* Call lstat64 if not done yet. */ -+ if (!is_link -+ && direntry->d_type != DT_UNKNOWN -+ && __builtin_expect (lstat64 (real_file_name, &lstat_buf), 0)) - { -- if (real_name != real_file_name) -- free (real_name); -+ error (0, errno, _("Cannot lstat %s"), file_name); - continue; - } -+#endif -+ -+ /* First search whether the auxiliary cache contains this -+ library already and it's not changed. */ -+ char *soname; -+ unsigned int osversion; -+ if (!search_aux_cache (&lstat_buf, &flag, &osversion, &soname)) -+ { -+ if (process_file (real_name, file_name, direntry->d_name, &flag, -+ &osversion, &soname, is_link, &lstat_buf)) -+ { -+ if (real_name != real_file_name) -+ free (real_name); -+ continue; -+ } -+ else if (opt_build_cache) -+ add_to_aux_cache (&lstat_buf, flag, osversion, soname); -+ } - -+ if (soname == NULL) -+ soname = implicit_soname (direntry->d_name, flag); - - /* A link may just point to itself. */ - if (is_link) -@@ -834,7 +864,7 @@ search_dir (const struct dir_entry *entr - || strncmp (real_base_name, soname, len) != 0) - is_link = 0; - } -- } -+ } - - if (real_name != real_file_name) - free (real_name); -@@ -849,6 +879,7 @@ search_dir (const struct dir_entry *entr - && (entry->flag == FLAG_ELF_LIBC5 - || entry->flag == FLAG_ELF_LIBC6)) - flag = entry->flag; -+ - /* Some sanity checks to print warnings. */ - if (opt_verbose) - { -@@ -864,6 +895,7 @@ search_dir (const struct dir_entry *entr - } - - /* Add library to list. */ -+ struct dlib_entry *dlib_ptr; - for (dlib_ptr = dlibs; dlib_ptr != NULL; dlib_ptr = dlib_ptr->next) - { - /* Is soname already in list? */ -@@ -888,12 +920,13 @@ search_dir (const struct dir_entry *entr - dlib_ptr->flag = flag; - else - error (0, 0, _("libraries %s and %s in directory %s have same soname but different type."), -- dlib_ptr->name, direntry->d_name, entry->path); -+ dlib_ptr->name, direntry->d_name, -+ entry->path); - } - free (dlib_ptr->name); -- dlib_ptr->osversion = osversion; - dlib_ptr->name = xstrdup (direntry->d_name); - dlib_ptr->is_link = is_link; -+ dlib_ptr->osversion = osversion; - } - /* Don't add this library, abort loop. */ - /* Also free soname, since it's dynamically allocated. */ -@@ -906,10 +939,10 @@ search_dir (const struct dir_entry *entr - { - dlib_ptr = (struct dlib_entry *)xmalloc (sizeof (struct dlib_entry)); - dlib_ptr->name = xstrdup (direntry->d_name); -- dlib_ptr->flag = flag; -- dlib_ptr->osversion = osversion; - dlib_ptr->soname = soname; -+ dlib_ptr->flag = flag; - dlib_ptr->is_link = is_link; -+ dlib_ptr->osversion = osversion; - /* Add at head of list. */ - dlib_ptr->next = dlibs; - dlibs = dlib_ptr; -@@ -920,6 +953,7 @@ search_dir (const struct dir_entry *entr - - /* Now dlibs contains a list of all libs - add those to the cache - and created all symbolic links. */ -+ struct dlib_entry *dlib_ptr; - for (dlib_ptr = dlibs; dlib_ptr != NULL; dlib_ptr = dlib_ptr->next) - { - /* Don't create links to links. */ -@@ -1246,7 +1280,7 @@ main (int argc, char **argv) - if (opt_chroot) - { - /* Canonicalize the directory name of cache_file, not cache_file, -- because we'll rename a temporary cache file to it. */ -+ because we'll rename a temporary cache file to it. */ - char *p = strrchr (cache_file, '/'); - char *canon = chroot_canon (opt_chroot, - p ? (*p = '\0', cache_file) : "/"); -@@ -1293,10 +1327,18 @@ main (int argc, char **argv) - add_system_dir (LIBDIR); - } - -+ if (! opt_ignore_aux_cache) -+ load_aux_cache (_PATH_LDCONFIG_AUX_CACHE); -+ else -+ init_aux_cache (); -+ - search_dirs (); - - if (opt_build_cache) -- save_cache (cache_file); -+ { -+ save_cache (cache_file); -+ save_aux_cache (_PATH_LDCONFIG_AUX_CACHE); -+ } - - return 0; - } ---- libc/elf/cache.c.jj 2007-07-16 09:58:46.000000000 +0200 -+++ libc/elf/cache.c 2007-07-27 18:20:09.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1999-2003,2005,2006 Free Software Foundation, Inc. -+/* Copyright (C) 1999-2003,2005,2006,2007 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Jaeger , 1999. - -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -80,16 +81,16 @@ print_entry (const char *lib, int flag, - fputs (",x86-64", stdout); - break; - case FLAG_S390_LIB64: -- fputs(",64bit", stdout); -+ fputs (",64bit", stdout); - break; - case FLAG_POWERPC_LIB64: -- fputs(",64bit", stdout); -+ fputs (",64bit", stdout); - break; - case FLAG_MIPS64_LIBN32: -- fputs(",N32", stdout); -+ fputs (",N32", stdout); - break; - case FLAG_MIPS64_LIBN64: -- fputs(",64bit", stdout); -+ fputs (",64bit", stdout); - case 0: - break; - default: -@@ -128,19 +129,11 @@ print_entry (const char *lib, int flag, - void - print_cache (const char *cache_name) - { -- size_t cache_size; -- struct stat64 st; -- int fd; -- unsigned int i; -- struct cache_file *cache; -- struct cache_file_new *cache_new = NULL; -- const char *cache_data; -- int format = 0; -- -- fd = open (cache_name, O_RDONLY); -+ int fd = open (cache_name, O_RDONLY); - if (fd < 0) - error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"), cache_name); - -+ struct stat64 st; - if (fstat64 (fd, &st) < 0 - /* No need to map the file if it is empty. */ - || st.st_size == 0) -@@ -149,14 +142,19 @@ print_cache (const char *cache_name) - return; - } - -- cache = mmap (0, st.st_size, PROT_READ, MAP_SHARED, fd, 0); -+ struct cache_file *cache -+ = mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - if (cache == MAP_FAILED) - error (EXIT_FAILURE, errno, _("mmap of cache file failed.\n")); -- cache_size = st.st_size; - -+ size_t cache_size = st.st_size; - if (cache_size < sizeof (struct cache_file)) - error (EXIT_FAILURE, 0, _("File is not a cache file.\n")); - -+ struct cache_file_new *cache_new = NULL; -+ const char *cache_data; -+ int format = 0; -+ - if (memcmp (cache->magic, CACHEMAGIC, sizeof CACHEMAGIC - 1)) - { - /* This can only be the new format without the old one. */ -@@ -201,7 +199,7 @@ print_cache (const char *cache_name) - printf (_("%d libs found in cache `%s'\n"), cache->nlibs, cache_name); - - /* Print everything. */ -- for (i = 0; i < cache->nlibs; i++) -+ for (unsigned int i = 0; i < cache->nlibs; i++) - print_entry (cache_data + cache->libs[i].key, - cache->libs[i].flags, 0, 0, - cache_data + cache->libs[i].value); -@@ -212,7 +210,7 @@ print_cache (const char *cache_name) - cache_new->nlibs, cache_name); - - /* Print everything. */ -- for (i = 0; i < cache_new->nlibs; i++) -+ for (unsigned int i = 0; i < cache_new->nlibs; i++) - print_entry (cache_data + cache_new->libs[i].key, - cache_new->libs[i].flags, - cache_new->libs[i].osversion, -@@ -231,15 +229,11 @@ init_cache (void) - entries = NULL; - } - -- -- --static --int compare (const struct cache_entry *e1, const struct cache_entry *e2) -+static int -+compare (const struct cache_entry *e1, const struct cache_entry *e2) - { -- int res; -- - /* We need to swap entries here to get the correct sort order. */ -- res = _dl_cache_libcmp (e2->lib, e1->lib); -+ int res = _dl_cache_libcmp (e2->lib, e1->lib); - if (res == 0) - { - if (e1->flags < e2->flags) -@@ -267,29 +261,19 @@ int compare (const struct cache_entry *e - void - save_cache (const char *cache_name) - { -- struct cache_entry *entry; -- int fd, idx_old, idx_new; -- size_t total_strlen, len; -- char *strings, *str, *temp_name; -- struct cache_file *file_entries = NULL; -- struct cache_file_new *file_entries_new = NULL; -- size_t file_entries_size = 0; -- size_t file_entries_new_size = 0; -- unsigned int str_offset; -- /* Number of cache entries. */ -- int cache_entry_count = 0; -- /* Number of normal cache entries. */ -- int cache_entry_old_count = 0; -- /* Pad for alignment of cache_file_new. */ -- size_t pad; -- - /* The cache entries are sorted already, save them in this order. */ - - /* Count the length of all strings. */ - /* The old format doesn't contain hwcap entries and doesn't contain - libraries in subdirectories with hwcaps entries. Count therefore - also all entries with hwcap == 0. */ -- total_strlen = 0; -+ size_t total_strlen = 0; -+ struct cache_entry *entry; -+ /* Number of cache entries. */ -+ int cache_entry_count = 0; -+ /* Number of normal cache entries. */ -+ int cache_entry_old_count = 0; -+ - for (entry = entries; entry != NULL; entry = entry->next) - { - /* Account the final NULs. */ -@@ -300,8 +284,8 @@ save_cache (const char *cache_name) - } - - /* Create the on disk cache structure. */ -- /* First an array for all strings. */ -- strings = (char *)xmalloc (total_strlen); -+ struct cache_file *file_entries = NULL; -+ size_t file_entries_size = 0; - - if (opt_format != 2) - { -@@ -315,25 +299,27 @@ save_cache (const char *cache_name) - /* And the list of all entries in the old format. */ - file_entries_size = sizeof (struct cache_file) - + cache_entry_old_count * sizeof (struct file_entry); -- file_entries = (struct cache_file *) xmalloc (file_entries_size); -+ file_entries = xmalloc (file_entries_size); - - /* Fill in the header. */ -- memset (file_entries, 0, sizeof (struct cache_file)); -+ memset (file_entries, '\0', sizeof (struct cache_file)); - memcpy (file_entries->magic, CACHEMAGIC, sizeof CACHEMAGIC - 1); - - file_entries->nlibs = cache_entry_old_count; - } - -+ struct cache_file_new *file_entries_new = NULL; -+ size_t file_entries_new_size = 0; -+ - if (opt_format != 0) - { - /* And the list of all entries in the new format. */ - file_entries_new_size = sizeof (struct cache_file_new) - + cache_entry_count * sizeof (struct file_entry_new); -- file_entries_new = -- (struct cache_file_new *) xmalloc (file_entries_new_size); -+ file_entries_new = xmalloc (file_entries_new_size); - - /* Fill in the header. */ -- memset (file_entries_new, 0, sizeof (struct cache_file_new)); -+ memset (file_entries_new, '\0', sizeof (struct cache_file_new)); - memcpy (file_entries_new->magic, CACHEMAGIC_NEW, - sizeof CACHEMAGIC_NEW - 1); - memcpy (file_entries_new->version, CACHE_VERSION, -@@ -343,17 +329,24 @@ save_cache (const char *cache_name) - file_entries_new->len_strings = total_strlen; - } - -- pad = ALIGN_CACHE (file_entries_size) - file_entries_size; -+ /* Pad for alignment of cache_file_new. */ -+ size_t pad = ALIGN_CACHE (file_entries_size) - file_entries_size; - - /* If we have both formats, we hide the new format in the strings - table, we have to adjust all string indices for this so that - old libc5/glibc 2 dynamic linkers just ignore them. */ -+ unsigned int str_offset; - if (opt_format != 0) - str_offset = file_entries_new_size; - else - str_offset = 0; - -- str = strings; -+ /* An array for all strings. */ -+ char *strings = xmalloc (total_strlen); -+ char *str = strings; -+ int idx_old; -+ int idx_new; -+ - for (idx_old = 0, idx_new = 0, entry = entries; entry != NULL; - entry = entry->next, ++idx_new) - { -@@ -375,21 +368,18 @@ save_cache (const char *cache_name) - file_entries_new->libs[idx_new].hwcap = entry->hwcap; - file_entries_new->libs[idx_new].key = str_offset; - } -- len = strlen (entry->lib); -- str = stpcpy (str, entry->lib); -- /* Account the final NUL. */ -- ++str; -- str_offset += len + 1; -+ -+ size_t len = strlen (entry->lib) + 1; -+ str = mempcpy (str, entry->lib, len); -+ str_offset += len; - /* Then the path. */ - if (opt_format != 2 && entry->hwcap == 0) - file_entries->libs[idx_old].value = str_offset + pad; - if (opt_format != 0) - file_entries_new->libs[idx_new].value = str_offset; -- len = strlen (entry->path); -- str = stpcpy (str, entry->path); -- /* Account the final NUL. */ -- ++str; -- str_offset += len + 1; -+ len = strlen (entry->path) + 1; -+ str = mempcpy (str, entry->path, len); -+ str_offset += len; - /* Ignore entries with hwcap for old format. */ - if (entry->hwcap == 0) - ++idx_old; -@@ -403,16 +393,12 @@ save_cache (const char *cache_name) - /* Write out the cache. */ - - /* Write cache first to a temporary file and rename it later. */ -- temp_name = xmalloc (strlen (cache_name) + 2); -+ char *temp_name = xmalloc (strlen (cache_name) + 2); - sprintf (temp_name, "%s~", cache_name); -- /* First remove an old copy if it exists. */ -- if (unlink (temp_name) && errno != ENOENT) -- error (EXIT_FAILURE, errno, _("Can't remove old temporary cache file %s"), -- temp_name); - - /* Create file. */ -- fd = open (temp_name, O_CREAT|O_WRONLY|O_TRUNC|O_NOFOLLOW, -- S_IROTH|S_IRGRP|S_IRUSR|S_IWUSR); -+ int fd = open (temp_name, O_CREAT|O_WRONLY|O_TRUNC|O_NOFOLLOW, -+ S_IRUSR|S_IWUSR); - if (fd < 0) - error (EXIT_FAILURE, errno, _("Can't create temporary cache file %s"), - temp_name); -@@ -439,11 +425,10 @@ save_cache (const char *cache_name) - error (EXIT_FAILURE, errno, _("Writing of cache data failed")); - } - -- if (write (fd, strings, total_strlen) != (ssize_t) total_strlen) -+ if (write (fd, strings, total_strlen) != (ssize_t) total_strlen -+ || close (fd)) - error (EXIT_FAILURE, errno, _("Writing of cache data failed")); - -- close (fd); -- - /* Make sure user can always read cache file */ - if (chmod (temp_name, S_IROTH|S_IRGRP|S_IRUSR|S_IWUSR)) - error (EXIT_FAILURE, errno, -@@ -463,8 +448,6 @@ save_cache (const char *cache_name) - while (entries) - { - entry = entries; -- free (entry->path); -- free (entry->lib); - entries = entries->next; - free (entry); - } -@@ -476,33 +459,29 @@ void - add_to_cache (const char *path, const char *lib, int flags, - unsigned int osversion, uint64_t hwcap) - { -- struct cache_entry *new_entry, *ptr, *prev; -- char *full_path; -- size_t len, i; -- -- new_entry = (struct cache_entry *) xmalloc (sizeof (struct cache_entry)); -- -- len = strlen (lib) + strlen (path) + 2; -- -- full_path = (char *) xmalloc (len); -- snprintf (full_path, len, "%s/%s", path, lib); -- -- new_entry->lib = xstrdup (lib); -- new_entry->path = full_path; -+ size_t liblen = strlen (lib) + 1; -+ size_t len = liblen + strlen (path) + 1; -+ struct cache_entry *new_entry -+ = xmalloc (sizeof (struct cache_entry) + liblen + len); -+ -+ new_entry->lib = memcpy ((char *) (new_entry + 1), lib, liblen); -+ new_entry->path = new_entry->lib + liblen; -+ snprintf (new_entry->path, len, "%s/%s", path, lib); - new_entry->flags = flags; - new_entry->osversion = osversion; - new_entry->hwcap = hwcap; - new_entry->bits_hwcap = 0; - - /* Count the number of bits set in the masked value. */ -- for (i = 0; (~((1ULL << i) - 1) & hwcap) != 0 && i < 8 * sizeof (hwcap); ++i) -+ for (size_t i = 0; -+ (~((1ULL << i) - 1) & hwcap) != 0 && i < 8 * sizeof (hwcap); ++i) - if ((hwcap & (1ULL << i)) != 0) - ++new_entry->bits_hwcap; - - - /* Keep the list sorted - search for right place to insert. */ -- ptr = entries; -- prev = entries; -+ struct cache_entry *ptr = entries; -+ struct cache_entry *prev = entries; - while (ptr != NULL) - { - if (compare (ptr, new_entry) > 0) -@@ -522,3 +501,304 @@ add_to_cache (const char *path, const ch - prev->next = new_entry; - } - } -+ -+ -+/* Auxiliary cache. */ -+ -+struct aux_cache_entry_id -+{ -+ uint64_t ino; -+ uint64_t ctime; -+ uint64_t size; -+ uint64_t dev; -+}; -+ -+struct aux_cache_entry -+{ -+ struct aux_cache_entry_id id; -+ int flags; -+ unsigned int osversion; -+ int used; -+ char *soname; -+ struct aux_cache_entry *next; -+}; -+ -+#define AUX_CACHEMAGIC "glibc-ld.so.auxcache-1.0" -+ -+struct aux_cache_file_entry -+{ -+ struct aux_cache_entry_id id; /* Unique id of entry. */ -+ int32_t flags; /* This is 1 for an ELF library. */ -+ uint32_t soname; /* String table indice. */ -+ uint32_t osversion; /* Required OS version. */ -+ int32_t pad; -+}; -+ -+/* ldconfig maintains an auxiliary cache file that allows -+ only reading those libraries that have changed since the last iteration. -+ For this for each library some information is cached in the auxiliary -+ cache. */ -+struct aux_cache_file -+{ -+ char magic[sizeof AUX_CACHEMAGIC - 1]; -+ uint32_t nlibs; /* Number of entries. */ -+ uint32_t len_strings; /* Size of string table. */ -+ struct aux_cache_file_entry libs[0]; /* Entries describing libraries. */ -+ /* After this the string table of size len_strings is found. */ -+}; -+ -+static unsigned int primes[] = -+{ -+ 1021, 2039, 4093, 8191, 16381, 32749, 65521, 131071, 262139, -+ 524287, 1048573, 2097143, 4194301, 8388593, 16777213, 33554393, -+ 67108859, 134217689, 268435399, 536870909, 1073741789, 2147483647 -+}; -+ -+static size_t aux_hash_size; -+static struct aux_cache_entry **aux_hash; -+ -+/* Simplistic hash function for aux_cache_entry_id. */ -+static unsigned int -+aux_cache_entry_id_hash (struct aux_cache_entry_id *id) -+{ -+ uint64_t ret = ((id->ino * 11 + id->ctime) * 11 + id->size) * 11 + id->dev; -+ return ret ^ (ret >> 32); -+} -+ -+static size_t nextprime (size_t x) -+{ -+ for (unsigned int i = 0; i < sizeof (primes) / sizeof (primes[0]); ++i) -+ if (primes[i] >= x) -+ return primes[i]; -+ return x; -+} -+ -+void -+init_aux_cache (void) -+{ -+ aux_hash_size = primes[3]; -+ aux_hash = xcalloc (aux_hash_size, sizeof (struct aux_cache_entry *)); -+} -+ -+int -+search_aux_cache (struct stat64 *stat_buf, int *flags, -+ unsigned int *osversion, char **soname) -+{ -+ struct aux_cache_entry_id id; -+ id.ino = (uint64_t) stat_buf->st_ino; -+ id.ctime = (uint64_t) stat_buf->st_ctime; -+ id.size = (uint64_t) stat_buf->st_size; -+ id.dev = (uint64_t) stat_buf->st_dev; -+ -+ unsigned int hash = aux_cache_entry_id_hash (&id); -+ struct aux_cache_entry *entry; -+ for (entry = aux_hash[hash % aux_hash_size]; entry; entry = entry->next) -+ if (id.ino == entry->id.ino -+ && id.ctime == entry->id.ctime -+ && id.size == entry->id.size -+ && id.dev == entry->id.dev) -+ { -+ *flags = entry->flags; -+ *osversion = entry->osversion; -+ if (entry->soname != NULL) -+ *soname = xstrdup (entry->soname); -+ else -+ *soname = NULL; -+ entry->used = 1; -+ return 1; -+ } -+ -+ return 0; -+} -+ -+static void -+insert_to_aux_cache (struct aux_cache_entry_id *id, int flags, -+ unsigned int osversion, const char *soname, int used) -+{ -+ size_t hash = aux_cache_entry_id_hash (id) % aux_hash_size; -+ struct aux_cache_entry *entry; -+ for (entry = aux_hash[hash]; entry; entry = entry->next) -+ if (id->ino == entry->id.ino -+ && id->ctime == entry->id.ctime -+ && id->size == entry->id.size -+ && id->dev == entry->id.dev) -+ abort (); -+ -+ size_t len = soname ? strlen (soname) + 1 : 0; -+ entry = xmalloc (sizeof (struct aux_cache_entry) + len); -+ entry->id = *id; -+ entry->flags = flags; -+ entry->osversion = osversion; -+ entry->used = used; -+ if (soname != NULL) -+ entry->soname = memcpy ((char *) (entry + 1), soname, len); -+ else -+ entry->soname = NULL; -+ entry->next = aux_hash[hash]; -+ aux_hash[hash] = entry; -+} -+ -+void -+add_to_aux_cache (struct stat64 *stat_buf, int flags, -+ unsigned int osversion, const char *soname) -+{ -+ struct aux_cache_entry_id id; -+ id.ino = (uint64_t) stat_buf->st_ino; -+ id.ctime = (uint64_t) stat_buf->st_ctime; -+ id.size = (uint64_t) stat_buf->st_size; -+ id.dev = (uint64_t) stat_buf->st_dev; -+ insert_to_aux_cache (&id, flags, osversion, soname, 1); -+} -+ -+/* Load auxiliary cache to search for unchanged entries. */ -+void -+load_aux_cache (const char *aux_cache_name) -+{ -+ int fd = open (aux_cache_name, O_RDONLY); -+ if (fd < 0) -+ { -+ init_aux_cache (); -+ return; -+ } -+ -+ struct stat64 st; -+ if (fstat64 (fd, &st) < 0 || st.st_size < sizeof (struct aux_cache_file)) -+ { -+ close (fd); -+ init_aux_cache (); -+ return; -+ } -+ -+ size_t aux_cache_size = st.st_size; -+ struct aux_cache_file *aux_cache -+ = mmap (NULL, aux_cache_size, PROT_READ, MAP_PRIVATE, fd, 0); -+ if (aux_cache == MAP_FAILED -+ || aux_cache_size < sizeof (struct aux_cache_file) -+ || memcmp (aux_cache->magic, AUX_CACHEMAGIC, sizeof AUX_CACHEMAGIC - 1) -+ || aux_cache->nlibs < 0 -+ || aux_cache->nlibs >= aux_cache_size) -+ { -+ close (fd); -+ init_aux_cache (); -+ return; -+ } -+ -+ aux_hash_size = nextprime (aux_cache->nlibs); -+ aux_hash = xcalloc (aux_hash_size, sizeof (struct aux_cache_entry *)); -+ -+ const char *aux_cache_data -+ = (const char *) &aux_cache->libs[aux_cache->nlibs]; -+ for (unsigned int i = 0; i < aux_cache->nlibs; ++i) -+ insert_to_aux_cache (&aux_cache->libs[i].id, -+ aux_cache->libs[i].flags, -+ aux_cache->libs[i].osversion, -+ aux_cache->libs[i].soname == 0 -+ ? NULL : aux_cache_data + aux_cache->libs[i].soname, -+ 0); -+ -+ munmap (aux_cache, aux_cache_size); -+ close (fd); -+} -+ -+/* Save the contents of the auxiliary cache. */ -+void -+save_aux_cache (const char *aux_cache_name) -+{ -+ /* Count the length of all sonames. We start with empty string. */ -+ size_t total_strlen = 1; -+ /* Number of cache entries. */ -+ int cache_entry_count = 0; -+ -+ for (size_t i = 0; i < aux_hash_size; ++i) -+ for (struct aux_cache_entry *entry = aux_hash[i]; -+ entry != NULL; entry = entry->next) -+ if (entry->used) -+ { -+ ++cache_entry_count; -+ if (entry->soname != NULL) -+ total_strlen += strlen (entry->soname) + 1; -+ } -+ -+ /* Auxiliary cache. */ -+ size_t file_entries_size -+ = sizeof (struct aux_cache_file) -+ + cache_entry_count * sizeof (struct aux_cache_file_entry); -+ struct aux_cache_file *file_entries -+ = xmalloc (file_entries_size + total_strlen); -+ -+ /* Fill in the header of the auxiliary cache. */ -+ memset (file_entries, '\0', sizeof (struct aux_cache_file)); -+ memcpy (file_entries->magic, AUX_CACHEMAGIC, sizeof AUX_CACHEMAGIC - 1); -+ -+ file_entries->nlibs = cache_entry_count; -+ file_entries->len_strings = total_strlen; -+ -+ /* Initial String offset for auxiliary cache is always after the -+ special empty string. */ -+ unsigned int str_offset = 1; -+ -+ /* An array for all strings. */ -+ char *str = (char *) file_entries + file_entries_size; -+ *str++ = '\0'; -+ -+ size_t idx = 0; -+ for (size_t i = 0; i < aux_hash_size; ++i) -+ for (struct aux_cache_entry *entry = aux_hash[i]; -+ entry != NULL; entry = entry->next) -+ if (entry->used) -+ { -+ file_entries->libs[idx].id = entry->id; -+ file_entries->libs[idx].flags = entry->flags; -+ if (entry->soname == NULL) -+ file_entries->libs[idx].soname = 0; -+ else -+ { -+ file_entries->libs[idx].soname = str_offset; -+ -+ size_t len = strlen (entry->soname) + 1; -+ str = mempcpy (str, entry->soname, len); -+ str_offset += len; -+ } -+ file_entries->libs[idx].osversion = entry->osversion; -+ file_entries->libs[idx++].pad = 0; -+ } -+ -+ /* Write out auxiliary cache file. */ -+ /* Write auxiliary cache first to a temporary file and rename it later. */ -+ -+ char *temp_name = xmalloc (strlen (aux_cache_name) + 2); -+ sprintf (temp_name, "%s~", aux_cache_name); -+ -+ /* Check that directory exists and create if needed. */ -+ char *dir = strdupa (aux_cache_name); -+ dir = dirname (dir); -+ -+ struct stat64 st; -+ if (stat64 (dir, &st) < 0) -+ { -+ if (mkdir (dir, 0700) < 0) -+ error (EXIT_FAILURE, errno, _("Cannot create directory %s"), dir); -+ } -+ -+ /* Create file. */ -+ int fd = open (temp_name, O_CREAT|O_WRONLY|O_TRUNC|O_NOFOLLOW, -+ S_IRUSR|S_IWUSR); -+ if (fd < 0) -+ error (EXIT_FAILURE, errno, -+ _("Can't create temporary auxiliary cache file %s"), -+ temp_name); -+ -+ if (write (fd, file_entries, file_entries_size + total_strlen) -+ != (ssize_t) (file_entries_size + total_strlen) -+ || close (fd)) -+ error (EXIT_FAILURE, errno, -+ _("Writing of auxiliary cache data failed")); -+ -+ /* Move temporary to its final location. */ -+ if (rename (temp_name, aux_cache_name)) -+ error (EXIT_FAILURE, errno, _("Renaming of %s to %s failed"), temp_name, -+ aux_cache_name); -+ -+ /* Free allocated memory. */ -+ free (file_entries); -+} ---- libc/sysdeps/generic/ldconfig.h.jj 2003-03-14 06:32:49.000000000 +0100 -+++ libc/sysdeps/generic/ldconfig.h 2007-07-27 17:39:46.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 1999, 2000, 2002, 2003, 2007 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Jaeger , 1999. - -@@ -35,6 +35,9 @@ - #define FLAG_MIPS64_LIBN32 0x0600 - #define FLAG_MIPS64_LIBN64 0x0700 - -+/* Name of auxiliary cache. */ -+#define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache" -+ - /* Declared in cache.c. */ - extern void print_cache (const char *cache_name); - -@@ -45,10 +48,24 @@ extern void save_cache (const char *cach - extern void add_to_cache (const char *path, const char *lib, int flags, - unsigned int osversion, uint64_t hwcap); - -+extern void init_aux_cache (void); -+ -+extern void load_aux_cache (const char *aux_cache_name); -+ -+extern int search_aux_cache (struct stat64 *stat_buf, int *flags, -+ unsigned int *osversion, char **soname); -+ -+extern void add_to_aux_cache (struct stat64 *stat_buf, int flags, -+ unsigned int osversion, const char *soname); -+ -+extern void save_aux_cache (const char *aux_cache_name); -+ - /* Declared in readlib.c. */ - extern int process_file (const char *real_file_name, const char *file_name, - const char *lib, int *flag, unsigned int *osversion, -- char **soname, int is_link); -+ char **soname, int is_link, struct stat64 *stat_buf); -+ -+extern char *implicit_soname (const char *lib, int flag); - - /* Declared in readelflib.c. */ - extern int process_elf_file (const char *file_name, const char *lib, int *flag, - diff --git a/glibc.spec b/glibc.spec index d6e8f46..4c77217 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,9 +1,9 @@ -%define glibcdate 20070731T1624 +%define glibcdate 20070801T1703 %define glibcname glibc -%define glibcsrcdir glibc-20070731T1624 +%define glibcsrcdir glibc-20070801T1703 %define glibc_release_tarballs 0 %define glibcversion 2.6.90 -%define glibcrelease 1 +%define glibcrelease 2 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define xenarches i686 athlon %ifarch %{xenarches} @@ -36,12 +36,6 @@ Source2: %(echo %{glibcsrcdir} | sed s/glibc-/glibc-libidn-/).tar.bz2 Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2 Patch0: %{glibcname}-fedora.patch Patch1: %{name}-ia64-lib64.patch -Patch2: glibc-warning-patrol.patch -Patch3: glibc-i386-rwlock.patch -Patch4: glibc-ldconfig-speedup.patch -Patch5: glibc-private-futex.patch -Patch6: glibc-fallocate.patch -Patch7: glibc-kaio-private-futex.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile @@ -159,6 +153,7 @@ Obsoletes: %{name}-headers(i386) Obsoletes: libc-debug, libc-headers, libc-devel Prereq: kernel-headers Requires: kernel-headers >= 2.2.1, %{name} = %{version}-%{release} +BuildRequires: kernel-headers >= 2.6.22 Autoreq: true %description headers @@ -253,538 +248,6 @@ package or when debugging this package. %patch1 -p1 %endif %endif -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 - -# Hack till glibc-kernheaders get updated, argh -mkdir -p override_headers/linux -cat > override_headers/linux/version.h < override_headers/asm/unistd.h < -%ifarch alpha -#ifndef __NR_stat64 -#define __NR_stat64 425 -#define __NR_lstat64 426 -#define __NR_fstat64 427 -#endif -#ifndef __NR_mq_open -#define __NR_mq_open 432 -#define __NR_mq_unlink 433 -#define __NR_mq_timedsend 434 -#define __NR_mq_timedreceive 435 -#define __NR_mq_notify 436 -#define __NR_mq_getsetattr 437 -#endif -#ifndef __NR_waitid -#define __NR_waitid 438 -#endif -#ifndef __NR_inotify_init -#define __NR_inotify_init 444 -#define __NR_inotify_add_watch 445 -#define __NR_inotify_rm_watch 446 -#endif -%endif -%ifarch %{ix86} -#ifndef __NR_mq_open -#define __NR_mq_open 277 -#define __NR_mq_unlink (__NR_mq_open+1) -#define __NR_mq_timedsend (__NR_mq_open+2) -#define __NR_mq_timedreceive (__NR_mq_open+3) -#define __NR_mq_notify (__NR_mq_open+4) -#define __NR_mq_getsetattr (__NR_mq_open+5) -#endif -#ifndef __NR_waitid -#define __NR_waitid 284 -#endif -#ifndef __NR_inotify_init -#define __NR_inotify_init 291 -#define __NR_inotify_add_watch 292 -#define __NR_inotify_rm_watch 293 -#endif -#ifndef __NR_openat -#define __NR_openat 295 -#define __NR_mkdirat 296 -#define __NR_mknodat 297 -#define __NR_fchownat 298 -#define __NR_futimesat 299 -#define __NR_unlinkat 301 -#define __NR_renameat 302 -#define __NR_linkat 303 -#define __NR_symlinkat 304 -#define __NR_readlinkat 305 -#define __NR_fchmodat 306 -#define __NR_faccessat 307 -#endif -#ifndef __NR_fstatat64 -#define __NR_fstatat64 300 -#endif -#ifndef __NR_pselect6 -#define __NR_pselect6 308 -#define __NR_ppoll 309 -#endif -#ifndef __NR_unshare -#define __NR_unshare 310 -#endif -#ifndef __NR_set_robust_list -#define __NR_set_robust_list 311 -#define __NR_get_robust_list 312 -#endif -#ifndef __NR_splice -#define __NR_splice 313 -#endif -#ifndef __NR_sync_file_range -#define __NR_sync_file_range 314 -#endif -#ifndef __NR_tee -#define __NR_tee 315 -#endif -#ifndef __NR_vmsplice -#define __NR_vmsplice 316 -#endif -%endif -%ifarch ia64 -#ifndef __NR_timer_create -#define __NR_timer_create 1248 -#define __NR_timer_settime 1249 -#define __NR_timer_gettime 1250 -#define __NR_timer_getoverrun 1251 -#define __NR_timer_delete 1252 -#define __NR_clock_settime 1253 -#define __NR_clock_gettime 1254 -#define __NR_clock_getres 1255 -#define __NR_clock_nanosleep 1256 -#endif -#ifndef __NR_mq_open -#define __NR_mq_open 1262 -#define __NR_mq_unlink 1263 -#define __NR_mq_timedsend 1264 -#define __NR_mq_timedreceive 1265 -#define __NR_mq_notify 1266 -#define __NR_mq_getsetattr 1267 -#endif -#ifndef __NR_waitid -#define __NR_waitid 1270 -#endif -#ifndef __NR_inotify_init -#define __NR_inotify_init 1277 -#define __NR_inotify_add_watch 1278 -#define __NR_inotify_rm_watch 1279 -#endif -#ifndef __NR_openat -#define __NR_openat 1281 -#define __NR_mkdirat 1282 -#define __NR_mknodat 1283 -#define __NR_fchownat 1284 -#define __NR_futimesat 1285 -#define __NR_newfstatat 1286 -#define __NR_unlinkat 1287 -#define __NR_renameat 1288 -#define __NR_linkat 1289 -#define __NR_symlinkat 1290 -#define __NR_readlinkat 1291 -#define __NR_fchmodat 1292 -#define __NR_faccessat 1293 -#endif -#if 0 -#ifndef __NR_pselect6 -#define __NR_pselect6 1294 -#define __NR_ppoll 1295 -#endif -#endif -#ifndef __NR_unshare -#define __NR_unshare 1296 -#endif -#ifndef __NR_splice -#define __NR_splice 1297 -#endif -#ifndef __NR_set_robust_list -#define __NR_set_robust_list 1298 -#define __NR_get_robust_list 1299 -#endif -#ifndef __NR_sync_file_range -#define __NR_sync_file_range 1300 -#endif -#ifndef __NR_tee -#define __NR_tee 1301 -#endif -#ifndef __NR_vmsplice -#define __NR_vmsplice 1302 -#endif -%endif -%ifarch ppc -#ifndef __NR_utimes -#define __NR_utimes 251 -#endif -#ifndef __NR_statfs64 -#define __NR_statfs64 252 -#define __NR_fstatfs64 253 -#endif -#ifndef __NR_fadvise64_64 -#define __NR_fadvise64_64 254 -#endif -#ifndef __NR_mq_open -#define __NR_mq_open 262 -#define __NR_mq_unlink 263 -#define __NR_mq_timedsend 264 -#define __NR_mq_timedreceive 265 -#define __NR_mq_notify 266 -#define __NR_mq_getsetattr 267 -#endif -#ifndef __NR_waitid -#define __NR_waitid 272 -#endif -#ifndef __NR_inotify_init -#define __NR_inotify_init 275 -#define __NR_inotify_add_watch 276 -#define __NR_inotify_rm_watch 277 -#endif -#ifndef __NR_pselect6 -#define __NR_pselect6 280 -#define __NR_ppoll 281 -#endif -#ifndef __NR_unshare -#define __NR_unshare 282 -#endif -#ifndef __NR_splice -#define __NR_splice 283 -#endif -#ifndef __NR_tee -#define __NR_tee 284 -#endif -#ifndef __NR_vmsplice -#define __NR_vmsplice 285 -#endif -#ifndef __NR_openat -#define __NR_openat 286 -#define __NR_mkdirat 287 -#define __NR_mknodat 288 -#define __NR_fchownat 289 -#define __NR_futimesat 290 -#define __NR_fstatat64 291 -#define __NR_unlinkat 292 -#define __NR_renameat 293 -#define __NR_linkat 294 -#define __NR_symlinkat 295 -#define __NR_readlinkat 296 -#define __NR_fchmodat 297 -#define __NR_faccessat 298 -#endif -%endif -%ifarch ppc64 -#ifndef __NR_utimes -#define __NR_utimes 251 -#endif -#ifndef __NR_mq_open -#define __NR_mq_open 262 -#define __NR_mq_unlink 263 -#define __NR_mq_timedsend 264 -#define __NR_mq_timedreceive 265 -#define __NR_mq_notify 266 -#define __NR_mq_getsetattr 267 -#endif -#ifndef __NR_waitid -#define __NR_waitid 272 -#endif -#ifndef __NR_inotify_init -#define __NR_inotify_init 275 -#define __NR_inotify_add_watch 276 -#define __NR_inotify_rm_watch 277 -#endif -#ifndef __NR_pselect6 -#define __NR_pselect6 280 -#define __NR_ppoll 281 -#endif -#ifndef __NR_unshare -#define __NR_unshare 282 -#endif -#ifndef __NR_splice -#define __NR_splice 283 -#endif -#ifndef __NR_tee -#define __NR_tee 284 -#endif -#ifndef __NR_vmsplice -#define __NR_vmsplice 285 -#endif -#ifndef __NR_openat -#define __NR_openat 286 -#define __NR_mkdirat 287 -#define __NR_mknodat 288 -#define __NR_fchownat 289 -#define __NR_futimesat 290 -#define __NR_newfstatat 291 -#define __NR_unlinkat 292 -#define __NR_renameat 293 -#define __NR_linkat 294 -#define __NR_symlinkat 295 -#define __NR_readlinkat 296 -#define __NR_fchmodat 297 -#define __NR_faccessat 298 -#endif -%endif -%ifarch s390 -#ifndef __NR_timer_create -#define __NR_timer_create 254 -#define __NR_timer_settime (__NR_timer_create+1) -#define __NR_timer_gettime (__NR_timer_create+2) -#define __NR_timer_getoverrun (__NR_timer_create+3) -#define __NR_timer_delete (__NR_timer_create+4) -#define __NR_clock_settime (__NR_timer_create+5) -#define __NR_clock_gettime (__NR_timer_create+6) -#define __NR_clock_getres (__NR_timer_create+7) -#define __NR_clock_nanosleep (__NR_timer_create+8) -#endif -#ifndef __NR_fadvise64_64 -#define __NR_fadvise64_64 264 -#endif -#ifndef __NR_statfs64 -#define __NR_statfs64 265 -#define __NR_fstatfs64 266 -#endif -#ifndef __NR_mq_open -#define __NR_mq_open 271 -#define __NR_mq_unlink 272 -#define __NR_mq_timedsend 273 -#define __NR_mq_timedreceive 274 -#define __NR_mq_notify 275 -#define __NR_mq_getsetattr 276 -#endif -#ifndef __NR_waitid -#define __NR_waitid 281 -#endif -#ifndef __NR_inotify_init -#define __NR_inotify_init 284 -#define __NR_inotify_add_watch 285 -#define __NR_inotify_rm_watch 286 -#endif -#ifndef __NR_openat -#define __NR_openat 288 -#define __NR_mkdirat 289 -#define __NR_mknodat 290 -#define __NR_fchownat 291 -#define __NR_futimesat 292 -#define __NR_fstatat64 293 -#define __NR_unlinkat 294 -#define __NR_renameat 295 -#define __NR_linkat 296 -#define __NR_symlinkat 297 -#define __NR_readlinkat 298 -#define __NR_fchmodat 299 -#define __NR_faccessat 300 -#endif -#ifndef __NR_pselect6 -#define __NR_pselect6 301 -#define __NR_ppoll 302 -#endif -#ifndef __NR_unshare -#define __NR_unshare 303 -#endif -%endif -%ifarch s390x -#ifndef __NR_timer_create -#define __NR_timer_create 254 -#define __NR_timer_settime (__NR_timer_create+1) -#define __NR_timer_gettime (__NR_timer_create+2) -#define __NR_timer_getoverrun (__NR_timer_create+3) -#define __NR_timer_delete (__NR_timer_create+4) -#define __NR_clock_settime (__NR_timer_create+5) -#define __NR_clock_gettime (__NR_timer_create+6) -#define __NR_clock_getres (__NR_timer_create+7) -#define __NR_clock_nanosleep (__NR_timer_create+8) -#endif -#ifndef __NR_mq_open -#define __NR_mq_open 271 -#define __NR_mq_unlink 272 -#define __NR_mq_timedsend 273 -#define __NR_mq_timedreceive 274 -#define __NR_mq_notify 275 -#define __NR_mq_getsetattr 276 -#endif -#ifndef __NR_waitid -#define __NR_waitid 281 -#endif -#ifndef __NR_inotify_init -#define __NR_inotify_init 284 -#define __NR_inotify_add_watch 285 -#define __NR_inotify_rm_watch 286 -#endif -#ifndef __NR_openat -#define __NR_openat 288 -#define __NR_mkdirat 289 -#define __NR_mknodat 290 -#define __NR_fchownat 291 -#define __NR_futimesat 292 -#define __NR_newfstatat 293 -#define __NR_unlinkat 294 -#define __NR_renameat 295 -#define __NR_linkat 296 -#define __NR_symlinkat 297 -#define __NR_readlinkat 298 -#define __NR_fchmodat 299 -#define __NR_faccessat 300 -#endif -#ifndef __NR_pselect6 -#define __NR_pselect6 301 -#define __NR_ppoll 302 -#endif -#ifndef __NR_unshare -#define __NR_unshare 303 -#endif -%endif -%ifarch sparc sparcv9 sparc64 -#ifndef __NR_mq_open -#define __NR_mq_open 273 -#define __NR_mq_unlink 274 -#define __NR_mq_timedsend 275 -#define __NR_mq_timedreceive 276 -#define __NR_mq_notify 277 -#define __NR_mq_getsetattr 278 -#endif -#ifndef __NR_waitid -#define __NR_waitid 279 -#endif -#ifndef __NR_stat64 -#define __NR_fstat64 63 -#define __NR_lstat64 132 -#define __NR_stat64 139 -#endif -#ifndef __NR_inotify_init -#define __NR_inotify_init 151 -#define __NR_inotify_add_watch 152 -#define __NR_inotify_rm_watch 156 -#endif -#ifndef __NR_openat -#define __NR_openat 284 -#define __NR_mkdirat 285 -#define __NR_mknodat 286 -#define __NR_fchownat 287 -#define __NR_futimesat 288 -#define __NR_newfstatat 289 -#define __NR_unlinkat 290 -#define __NR_renameat 291 -#define __NR_linkat 292 -#define __NR_symlinkat 293 -#define __NR_readlinkat 294 -#define __NR_fchmodat 295 -#define __NR_faccessat 296 -#endif -#ifndef __NR_pselect6 -#define __NR_pselect6 297 -#define __NR_ppoll 298 -#endif -#ifndef __NR_unshare -#define __NR_unshare 299 -#endif -%endif -%ifarch x86_64 -#ifndef __NR_mq_open -#define __NR_mq_open 240 -#define __NR_mq_unlink 241 -#define __NR_mq_timedsend 242 -#define __NR_mq_timedreceive 243 -#define __NR_mq_notify 244 -#define __NR_mq_getsetattr 245 -#endif -#ifndef __NR_waitid -#define __NR_waitid 247 -#endif -#ifndef __NR_inotify_init -#define __NR_inotify_init 253 -#define __NR_inotify_add_watch 254 -#define __NR_inotify_rm_watch 255 -#endif -#ifndef __NR_openat -#define __NR_openat 257 -#define __NR_mkdirat 258 -#define __NR_mknodat 259 -#define __NR_fchownat 260 -#define __NR_futimesat 261 -#define __NR_newfstatat 262 -#define __NR_unlinkat 263 -#define __NR_renameat 264 -#define __NR_linkat 265 -#define __NR_symlinkat 266 -#define __NR_readlinkat 267 -#define __NR_fchmodat 268 -#define __NR_faccessat 269 -#endif -#ifndef __NR_pselect6 -#define __NR_pselect6 270 -#define __NR_ppoll 271 -#endif -#ifndef __NR_unshare -#define __NR_unshare 272 -#endif -#ifndef __NR_set_robust_list -#define __NR_set_robust_list 273 -#define __NR_get_robust_list 274 -#endif -#ifndef __NR_splice -#define __NR_splice 275 -#endif -#ifndef __NR_tee -#define __NR_tee 276 -#endif -#ifndef __NR_sync_file_range -#define __NR_sync_file_range 277 -#endif -#ifndef __NR_vmsplice -#define __NR_vmsplice 278 -#endif -%endif -#endif -EOF -cat > override_headers/asm/errno.h < -%ifarch alpha -#ifndef ENOKEY -#define ENOKEY 132 -#define EKEYEXPIRED 133 -#define EKEYREVOKED 134 -#define EKEYREJECTED 135 -#endif -#ifndef EOWNERDEAD -#define EOWNERDEAD 136 -#define ENOTRECOVERABLE 137 -#endif -%endif -%ifarch %{ix86} ia64 ppc ppc64 s390 s390x x86_64 -#ifndef ENOKEY -#define ENOKEY 126 -#define EKEYEXPIRED 127 -#define EKEYREVOKED 128 -#define EKEYREJECTED 129 -#endif -#ifndef EOWNERDEAD -#define EOWNERDEAD 130 -#define ENOTRECOVERABLE 131 -#endif -%endif -%ifarch sparc sparcv9 sparc64 -#ifndef ENOKEY -#define ENOKEY 128 -#define EKEYEXPIRED 129 -#define EKEYREVOKED 130 -#define EKEYREJECTED 131 -#endif -#ifndef EOWNERDEAD -#define EOWNERDEAD 132 -#define ENOTRECOVERABLE 133 -#endif -%endif -#endif -EOF # A lot of programs still misuse memcpy when they have to use # memmove. The memcpy implementation below is not tolerant at @@ -857,7 +320,7 @@ mkdir $builddir ; cd $builddir build_CFLAGS="$BuildFlags -g -O3 $*" CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \ --enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \ - --with-headers=`cd ..; pwd`/override_headers:%{_prefix}/include --enable-bind-now \ + --with-headers=%{_prefix}/include --enable-bind-now \ --with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \ --host %{nptl_target_cpu}-redhat-linux \ --disable-profile @@ -1583,6 +1046,12 @@ rm -f *.filelist* %endif %changelog +* Wed Aug 1 2007 Jakub Jelinek 2.6.90-2 +- make aux-cache purely optional performance optimization in ldconfig, + don't issue any errors if it can't be created (#250430) +- remove override_headers hack, BuildRequire >= 2.6.22 kernel-headers + and rely on its content + * Tue Jul 31 2007 Jakub Jelinek 2.6.90-1 - update to trunk - private futex optimizations