diff --git a/.cvsignore b/.cvsignore index 6f486d4..11ce915 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20050620T1530.tar.bz2 -glibc-fedora-20050620T1530.tar.bz2 +glibc-20050627T0850.tar.bz2 +glibc-fedora-20050627T0850.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 1b6a54f..cf9d6b6 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,39 +1,6 @@ ---- glibc-20050620T1530/ChangeLog 20 Jun 2005 15:25:49 -0000 1.9392 -+++ glibc-20050620T1530-fedora/ChangeLog 20 Jun 2005 15:57:16 -0000 1.8782.2.109 -@@ -753,6 +753,14 @@ - * nscd/connections.c (nscd_run): Use time() value in prune_cache - call, not timeout value, since the latter might be from another clock. - -+2005-04-27 Jakub Jelinek -+ -+ * elf/rtld.c (dl_main): Call _dl_init_linuxthreads_paths -+ if GLRO(dl_osversion) <= 0x20413. -+ * elf/dl-load.c (_dl_init_paths): Allocate one extra pointer in -+ rtld_search_dirs.dirs. -+ (_dl_init_linuxthreads_paths): New function. -+ - 2005-04-27 Roland McGrath - - [BZ #877] -@@ -1368,17 +1376,6 @@ - - 2005-03-28 Roland McGrath - -- * sysdeps/generic/w_exp2.c [NO_LONG_DOUBLE]: Fix typos in alias names. -- Reported by Mark Mitchell . -- * Versions.def (libm): Define GLIBC_2.4 set. -- * math/Versions (libm: GLIBC_2.4): Add this set, with exp2l. -- * sysdeps/i386/Versions (libm: GLIBC_2.1): Add this set, with exp2l. -- * sysdeps/ia64/Versions: Likewise. -- * sysdeps/m68k/Versions: Likewise. -- * sysdeps/sparc/sparc64/Versions: Likewise. -- * sysdeps/x86_64/Versions: New file. -- * sysdeps/mips/mips64/Versions: New file. -- - * locale/langinfo.h (_NL_LOCALE_NAME): New macro. - [__USE_GNU] (NL_LOCALE_NAME): New macro. - * locale/nl_langinfo.c: Grok special item value for _NL_LOCALE_NAME, -@@ -2447,6 +2444,18 @@ +--- glibc-20050627T0850/ChangeLog 26 Jun 2005 19:06:12 -0000 1.9398 ++++ glibc-20050627T0850-fedora/ChangeLog 27 Jun 2005 13:04:06 -0000 1.8782.2.111 +@@ -2508,6 +2508,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -52,8 +19,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20050620T1530/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20050620T1530-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050627T0850/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20050627T0850-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -103,8 +70,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20050620T1530/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20050620T1530-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20050627T0850/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20050627T0850-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -131,8 +98,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20050620T1530/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20050620T1530-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20050627T0850/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20050627T0850-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -213,34 +180,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20050620T1530/Versions.def 28 Mar 2005 20:42:44 -0000 1.61 -+++ glibc-20050620T1530-fedora/Versions.def 24 Mar 2005 08:18:51 -0000 1.58.2.3 -@@ -20,7 +20,6 @@ libc { - GLIBC_2.3.2 - GLIBC_2.3.3 - GLIBC_2.3.4 -- GLIBC_2.4 - %ifdef USE_IN_LIBIO - HURD_CTHREADS_0.3 - %endif -@@ -44,7 +43,6 @@ libm { - GLIBC_2.2 - GLIBC_2.2.3 - GLIBC_2.3.4 -- GLIBC_2.4 - } - libnsl { - GLIBC_2.0 ---- glibc-20050620T1530/version.h 20 Dec 2004 23:37:41 -0000 1.67 -+++ glibc-20050620T1530-fedora/version.h 15 Apr 2005 09:32:42 -0000 1.65.2.4 -@@ -1,4 +1,4 @@ - /* This file just defines the current version number of libc. */ - - #define RELEASE "development" --#define VERSION "2.3.90" -+#define VERSION "2.3.5" ---- glibc-20050620T1530/csu/elf-init.c 14 Feb 2005 21:21:36 -0000 1.5 -+++ glibc-20050620T1530-fedora/csu/elf-init.c 3 Mar 2005 13:33:53 -0000 1.3.2.3 +--- glibc-20050627T0850/csu/elf-init.c 14 Feb 2005 21:21:36 -0000 1.5 ++++ glibc-20050627T0850-fedora/csu/elf-init.c 3 Mar 2005 13:33:53 -0000 1.3.2.3 @@ -44,6 +44,24 @@ extern void (*__init_array_start []) (vo extern void (*__init_array_end []) (void) attribute_hidden; extern void (*__fini_array_start []) (void) attribute_hidden; @@ -266,179 +207,8 @@ #endif /* These function symbols are provided for the .init/.fini section entry ---- glibc-20050620T1530/debug/Versions 1 Mar 2005 00:12:31 -0000 1.6 -+++ glibc-20050620T1530-fedora/debug/Versions 3 Mar 2005 16:52:26 -0000 1.3.4.3 -@@ -18,10 +18,4 @@ libc { - __printf_chk; __fprintf_chk; __vprintf_chk; __vfprintf_chk; - __gets_chk; - } -- GLIBC_2.4 { -- __fgets_chk; __fgets_unlocked_chk; -- __read_chk; __pread_chk; __pread64_chk; -- __readlink_chk; __getcwd_chk; __getwd_chk; -- __recv_chk; __recvfrom_chk; -- } - } ---- glibc-20050620T1530/debug/fgets_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050620T1530-fedora/debug/fgets_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 -@@ -30,6 +30,7 @@ - #include - #include - -+#if 0 - char * - __fgets_chk (buf, size, n, fp) - char *buf; -@@ -65,3 +66,4 @@ __fgets_chk (buf, size, n, fp) - _IO_release_lock (fp); - return result; - } -+#endif ---- glibc-20050620T1530/debug/fgets_u_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050620T1530-fedora/debug/fgets_u_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 -@@ -30,6 +30,7 @@ - #include - #include - -+#if 0 - char * - __fgets_unlocked_chk (buf, size, n, fp) - char *buf; -@@ -63,3 +64,4 @@ __fgets_unlocked_chk (buf, size, n, fp) - fp->_IO_file_flags |= old_error; - return result; - } -+#endif ---- glibc-20050620T1530/debug/getcwd_chk.c 1 Mar 2005 00:42:41 -0000 1.2 -+++ glibc-20050620T1530-fedora/debug/getcwd_chk.c 3 Mar 2005 16:52:26 -0000 1.2.2.2 -@@ -20,7 +20,7 @@ - #include - #include - -- -+#if 0 - char * - __getcwd_chk (char *buf, size_t size, size_t buflen) - { -@@ -29,3 +29,4 @@ __getcwd_chk (char *buf, size_t size, si - - return __getcwd (buf, size); - } -+#endif ---- glibc-20050620T1530/debug/getwd_chk.c 21 Feb 2005 22:53:35 -0000 1.1 -+++ glibc-20050620T1530-fedora/debug/getwd_chk.c 3 Mar 2005 16:52:26 -0000 1.1.2.2 -@@ -20,7 +20,7 @@ - #include - #include - -- -+#if 0 - char * - __getwd_chk (char *buf, size_t buflen) - { -@@ -32,3 +32,4 @@ __getwd_chk (char *buf, size_t buflen) - - link_warning (getwd, - "the `getwd' function is dangerous and should not be used.") -+#endif ---- glibc-20050620T1530/debug/pread64_chk.c 14 Jun 2005 15:47:21 -0000 1.5 -+++ glibc-20050620T1530-fedora/debug/pread64_chk.c 20 Jun 2005 15:57:40 -0000 1.3.2.4 -@@ -19,7 +19,7 @@ - #include - #include - -- -+#if 0 - ssize_t - __pread64_chk (int fd, void *buf, size_t nbytes, off64_t offset, size_t buflen) - { -@@ -28,3 +28,4 @@ __pread64_chk (int fd, void *buf, size_t - - return __libc_pread64 (fd, buf, nbytes, offset); - } -+#endif ---- glibc-20050620T1530/debug/pread_chk.c 19 Mar 2005 00:07:31 -0000 1.4 -+++ glibc-20050620T1530-fedora/debug/pread_chk.c 19 Mar 2005 20:18:00 -0000 1.3.2.3 -@@ -19,7 +19,7 @@ - #include - #include - -- -+#if 0 - ssize_t - __pread_chk (int fd, void *buf, size_t nbytes, off_t offset, size_t buflen) - { -@@ -28,3 +28,4 @@ __pread_chk (int fd, void *buf, size_t n - - return __pread (fd, buf, nbytes, offset); - } -+#endif ---- glibc-20050620T1530/debug/read_chk.c 1 Mar 2005 00:35:58 -0000 1.4 -+++ glibc-20050620T1530-fedora/debug/read_chk.c 3 Mar 2005 16:52:26 -0000 1.4.2.2 -@@ -23,7 +23,7 @@ - # include - #endif - -- -+#if 0 - ssize_t - __read_chk (int fd, void *buf, size_t nbytes, size_t buflen) - { -@@ -36,3 +36,4 @@ __read_chk (int fd, void *buf, size_t nb - return __read (fd, buf, nbytes); - #endif - } -+#endif ---- glibc-20050620T1530/debug/readlink_chk.c 1 Mar 2005 00:41:15 -0000 1.3 -+++ glibc-20050620T1530-fedora/debug/readlink_chk.c 3 Mar 2005 16:52:26 -0000 1.3.2.2 -@@ -23,7 +23,7 @@ - # include - #endif - -- -+#if 0 - ssize_t - __readlink_chk (const char *path, void *buf, size_t len, size_t buflen) - { -@@ -36,3 +36,4 @@ __readlink_chk (const char *path, void * - return __readlink (path, buf, len); - #endif - } -+#endif ---- glibc-20050620T1530/debug/recv_chk.c 6 Mar 2005 21:24:42 -0000 1.2 -+++ glibc-20050620T1530-fedora/debug/recv_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 -@@ -19,7 +19,7 @@ - #include - #include - -- -+#if 0 - ssize_t - __recv_chk (int fd, void *buf, size_t n, size_t buflen, int flags) - { -@@ -28,3 +28,4 @@ __recv_chk (int fd, void *buf, size_t n, - - return __recv (fd, buf, n, flags); - } -+#endif ---- glibc-20050620T1530/debug/recvfrom_chk.c 6 Mar 2005 21:24:16 -0000 1.2 -+++ glibc-20050620T1530-fedora/debug/recvfrom_chk.c 19 Mar 2005 20:18:00 -0000 1.1.2.3 -@@ -19,7 +19,7 @@ - #include - #include - -- -+#if 0 - ssize_t - __recvfrom_chk (int fd, void *buf, size_t n, size_t buflen, int flags, - __SOCKADDR_ARG addr, socklen_t *addr_len) -@@ -29,3 +29,4 @@ __recvfrom_chk (int fd, void *buf, size_ - - return __recvfrom (fd, buf, n, flags, addr, addr_len); - } -+#endif ---- glibc-20050620T1530/debug/tst-chk1.c 19 Mar 2005 00:09:08 -0000 1.7 -+++ glibc-20050620T1530-fedora/debug/tst-chk1.c 19 Mar 2005 21:04:10 -0000 1.1.2.10 +--- glibc-20050627T0850/debug/tst-chk1.c 19 Mar 2005 00:09:08 -0000 1.7 ++++ glibc-20050627T0850-fedora/debug/tst-chk1.c 27 Jun 2005 13:04:11 -0000 1.1.2.11 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -467,77 +237,8 @@ # define O 0 #else # define O 1 -@@ -768,7 +771,7 @@ do_test (void) - || strcmp (getcwdbuf + 1, fname) != 0) - FAIL (); - --#if __USE_FORTIFY_LEVEL >= 1 -+#if 0 && __USE_FORTIFY_LEVEL >= 1 - CHK_FAIL_START - if (getwd (getcwdbuf + 2) != getcwdbuf + 2) - FAIL (); ---- glibc-20050620T1530/elf/dl-load.c 26 Apr 2005 04:25:58 -0000 1.268 -+++ glibc-20050620T1530-fedora/elf/dl-load.c 27 Apr 2005 11:40:21 -0000 1.249.2.12 -@@ -644,7 +644,7 @@ _dl_init_paths (const char *llp) - - /* First set up the rest of the default search directory entries. */ - aelem = rtld_search_dirs.dirs = (struct r_search_path_elem **) -- malloc ((nsystem_dirs_len + 1) * sizeof (struct r_search_path_elem *)); -+ malloc ((nsystem_dirs_len + 2) * sizeof (struct r_search_path_elem *)); - if (rtld_search_dirs.dirs == NULL) - { - errstring = N_("cannot create search path array"); -@@ -780,6 +780,34 @@ _dl_init_paths (const char *llp) - } - - -+void -+internal_function -+_dl_init_linuxthreads_paths (void) -+{ -+ size_t cnt; -+ struct r_search_path_elem *elem, **aelem; -+ -+ elem = malloc (sizeof (struct r_search_path_elem) -+ + ncapstr * sizeof (enum r_dir_status)); -+ if (elem == NULL) -+ return; -+ -+ for (aelem = rtld_search_dirs.dirs; *aelem; aelem++); -+ aelem[0] = elem; -+ aelem[1] = NULL; -+ elem->what = "linuxthreads search path"; -+ elem->where = NULL; -+ elem->dirname = "/" DL_DST_LIB "/obsolete/linuxthreads/"; -+ elem->dirnamelen = sizeof ("/" DL_DST_LIB "/obsolete/linuxthreads/") - 1; -+ if (elem->dirnamelen > max_dirnamelen) -+ max_dirnamelen = elem->dirnamelen; -+ for (cnt = 0; cnt < ncapstr; ++cnt) -+ elem->status[cnt] = unknown; -+ elem->next = NULL; -+ aelem[-1]->next = elem; -+} -+ -+ - static void - __attribute__ ((noreturn, noinline)) - lose (int code, int fd, const char *name, char *realname, struct link_map *l, ---- glibc-20050620T1530/elf/dl-support.c 11 May 2005 17:27:22 -0000 1.89 -+++ glibc-20050620T1530-fedora/elf/dl-support.c 20 May 2005 09:39:57 -0000 1.84.2.6 -@@ -281,6 +281,11 @@ _dl_non_dynamic_init (void) - if (_dl_platform != NULL) - _dl_platformlen = strlen (_dl_platform); - -+#if defined (__i386__) && !defined (USE_TLS) -+ /* Load libs not using TLS. */ -+ _dl_osversion = 0x20205; -+#endif -+ - /* Scan for a program header telling us the stack is nonexecutable. */ - if (_dl_phdr != NULL) - for (uint_fast16_t i = 0; i < _dl_phnum; ++i) ---- glibc-20050620T1530/elf/ldconfig.c 7 Apr 2005 20:56:56 -0000 1.49 -+++ glibc-20050620T1530-fedora/elf/ldconfig.c 15 Apr 2005 09:32:44 -0000 1.47.2.3 +--- glibc-20050627T0850/elf/ldconfig.c 7 Apr 2005 20:56:56 -0000 1.49 ++++ glibc-20050627T0850-fedora/elf/ldconfig.c 15 Apr 2005 09:32:44 -0000 1.47.2.3 @@ -953,17 +953,19 @@ search_dirs (void) @@ -619,141 +320,8 @@ } search_dirs (); ---- glibc-20050620T1530/elf/rtld.c 13 Jun 2005 22:56:24 -0000 1.354 -+++ glibc-20050620T1530-fedora/elf/rtld.c 20 Jun 2005 15:57:44 -0000 1.330.2.20 -@@ -1350,6 +1350,59 @@ ld.so does not support TLS, but program - ++GL(dl_ns)[LM_ID_BASE]._ns_nloaded; - ++GL(dl_load_adds); - -+#if defined(__i386__) -+ /* Force non-TLS libraries for glibc 2.0 binaries -+ or if a buggy binary references non-TLS errno or h_errno. */ -+ if (__builtin_expect (main_map->l_info[DT_NUM + DT_THISPROCNUM -+ + DT_VERSIONTAGIDX (DT_VERNEED)] -+ == NULL, 0) -+ && main_map->l_info[DT_DEBUG]) -+ GLRO(dl_osversion) = 0x20205; -+ else if ((__builtin_expect (mode, normal) != normal -+ || main_map->l_info[ADDRIDX (DT_GNU_LIBLIST)] == NULL) -+ /* Only binaries have DT_DEBUG dynamic tags... */ -+ && main_map->l_info[DT_DEBUG]) -+ { -+ /* Workaround for buggy binaries. This doesn't handle buggy -+ libraries. */ -+ bool buggy = false; -+ const ElfW(Sym) *symtab = (const void *) D_PTR (main_map, -+ l_info[DT_SYMTAB]); -+ const char *strtab = (const void *) D_PTR (main_map, -+ l_info[DT_STRTAB]); -+ Elf_Symndx symidx; -+ for (symidx = main_map->l_buckets[0x6c994f % main_map->l_nbuckets]; -+ symidx != STN_UNDEF; -+ symidx = main_map->l_chain[symidx]) -+ { -+ if (__builtin_expect (strcmp (strtab + symtab[symidx].st_name, -+ "errno") == 0, 0) -+ && ELFW(ST_TYPE) (symtab[symidx].st_info) != STT_TLS) -+ buggy = true; -+ } -+ for (symidx = main_map->l_buckets[0xe5c992f % main_map->l_nbuckets]; -+ symidx != STN_UNDEF; -+ symidx = main_map->l_chain[symidx]) -+ { -+ if (__builtin_expect (strcmp (strtab + symtab[symidx].st_name, -+ "h_errno") == 0, 0) -+ && ELFW(ST_TYPE) (symtab[symidx].st_info) != STT_TLS) -+ buggy = true; -+ } -+ if (__builtin_expect (buggy, false) && GLRO(dl_osversion) > 0x20401) -+ { -+ GLRO(dl_osversion) = 0x20401; -+ _dl_error_printf ("Incorrectly built binary which accesses errno or h_errno directly. Needs to be fixed.\n"); -+ } -+ } -+#endif -+ -+ if (GLRO(dl_osversion) <= 0x20413) -+ { -+ extern void internal_function _dl_init_linuxthreads_paths (void); -+ _dl_init_linuxthreads_paths (); -+ } -+ - /* If LD_USE_LOAD_BIAS env variable has not been seen, default - to not using bias for non-prelinked PIEs and libraries - and using it for executables or prelinked PIEs or libraries. */ -@@ -1708,6 +1761,57 @@ ERROR: ld.so: object '%s' cannot be load - } - } - -+#if defined(__i386__) || defined(__alpha__) || (defined(__sparc__) && !defined(__arch64__)) -+ /* -+ * Modifications by Red Hat Software -+ * -+ * Deal with the broken binaries from the non-versioned ages of glibc. -+ * If a binary does not have version information enabled, we assume that -+ * it is a glibc 2.0 binary and we load a compatibility library to try to -+ * overcome binary incompatibilities. -+ * Blame: gafton@redhat.com -+ */ -+#define LIB_NOVERSION "/lib/libNoVersion.so.1" -+ -+ if (__builtin_expect (main_map->l_info[DT_NUM + DT_THISPROCNUM -+ + DT_VERSIONTAGIDX (DT_VERNEED)] -+ == NULL, 0) -+ && (main_map->l_info[DT_DEBUG] -+ || !(GLRO(dl_debug_mask) & DL_DEBUG_PRELINK))) -+ { -+ struct stat test_st; -+ int test_fd; -+ int can_load; -+ -+ HP_TIMING_NOW (start); -+ -+/* _dl_sysdep_message("Loading compatibility library... ", NULL); */ -+ -+ can_load = 1; -+ test_fd = __open (LIB_NOVERSION, O_RDONLY); -+ if (test_fd < 0) { -+ can_load = 0; -+/* _dl_sysdep_message(" Can't find " LIB_NOVERSION "\n", NULL); */ -+ } else { -+ if (__fxstat (_STAT_VER, test_fd, &test_st) < 0 || test_st.st_size == 0) { -+ can_load = 0; -+/* _dl_sysdep_message(" Can't stat " LIB_NOVERSION "\n", NULL); */ -+ } -+ } -+ -+ if (test_fd >= 0) /* open did no fail.. */ -+ __close(test_fd); /* avoid fd leaks */ -+ -+ if (can_load != 0) -+ npreloads += do_preload (LIB_NOVERSION, main_map, -+ "nonversioned binary"); -+ -+ HP_TIMING_NOW (stop); -+ HP_TIMING_DIFF (diff, start, stop); -+ HP_TIMING_ACCUM_NT (load_time, diff); -+ } -+#endif -+ - if (__builtin_expect (*first_preload != NULL, 0)) - { - /* Set up PRELOADS with a vector of the preloaded libraries. */ ---- glibc-20050620T1530/elf/tst-tls10.h 17 Apr 2003 19:19:01 -0000 1.1 -+++ glibc-20050620T1530-fedora/elf/tst-tls10.h 22 Sep 2004 21:20:48 -0000 1.1.2.1 -@@ -1,8 +1,8 @@ - #include - #include - --#if defined USE_TLS && defined HAVE___THREAD \ -- && defined HAVE_TLS_MODEL_ATTRIBUTE -+#if defined USE_TLS \ -+ && (0 || (defined HAVE___THREAD && defined HAVE_TLS_MODEL_ATTRIBUTE)) - # define USE_TLS__THREAD - - struct A ---- glibc-20050620T1530/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 -+++ glibc-20050620T1530-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 +--- glibc-20050627T0850/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 ++++ glibc-20050627T0850-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 @@ -1013,6 +1013,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -830,8 +398,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20050620T1530/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 -+++ glibc-20050620T1530-fedora/include/features.h 3 Mar 2005 14:03:16 -0000 1.35.2.7 +--- glibc-20050627T0850/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 ++++ glibc-20050627T0850-fedora/include/features.h 27 Jun 2005 13:04:16 -0000 1.35.2.8 @@ -262,7 +262,13 @@ # define __USE_REENTRANT 1 #endif @@ -847,17 +415,8 @@ # if _FORTIFY_SOURCE == 1 # define __USE_FORTIFY_LEVEL 1 # elif _FORTIFY_SOURCE > 1 -@@ -289,7 +295,7 @@ - /* Major and minor version number of the GNU C library package. Use - these macros to test for features in specific releases. */ - #define __GLIBC__ 2 --#define __GLIBC_MINOR__ 4 -+#define __GLIBC_MINOR__ 3 - - #define __GLIBC_PREREQ(maj, min) \ - ((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min)) ---- glibc-20050620T1530/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20050620T1530-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20050627T0850/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20050627T0850-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -867,8 +426,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20050620T1530/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 -+++ glibc-20050620T1530-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 +--- glibc-20050627T0850/libio/stdio.h 7 Jan 2005 19:30:00 -0000 1.81 ++++ glibc-20050627T0850-fedora/libio/stdio.h 8 Feb 2005 10:04:09 -0000 1.78.2.4 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -882,8 +441,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20050620T1530/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20050620T1530-fedora/libio/bits/stdio2.h 19 Mar 2005 20:18:03 -0000 1.1.2.5 +--- glibc-20050627T0850/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20050627T0850-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -914,48 +473,8 @@ #endif -@@ -83,8 +94,7 @@ gets (char *__str) - return __gets_alias (__str); - } - --extern char *__fgets_chk (char *__restrict __s, size_t __size, int __n, -- FILE *__restrict __stream) __wur; -+extern void __chk_fail (void) __attribute__((__noreturn__)); - extern char *__REDIRECT (__fgets_alias, - (char *__restrict __s, int __n, - FILE *__restrict __stream), fgets) __wur; -@@ -92,15 +102,12 @@ extern char *__REDIRECT (__fgets_alias, - extern __always_inline __wur char * - fgets (char *__restrict __s, int __n, FILE *__restrict __stream) - { -- if (__bos (__s) != (size_t) -1 -- && (!__builtin_constant_p (__n) || (size_t) __n > __bos (__s))) -- return __fgets_chk (__s, __bos (__s), __n, __stream); -+ if (__bos (__s) != (size_t) -1 && (size_t) __n > __bos (__s)) -+ __chk_fail (); - return __fgets_alias (__s, __n, __stream); - } - - #ifdef __USE_GNU --extern char *__fgets_unlocked_chk (char *__restrict __s, size_t __size, -- int __n, FILE *__restrict __stream) __wur; - extern char *__REDIRECT (__fgets_unlocked_alias, - (char *__restrict __s, int __n, - FILE *__restrict __stream), fgets_unlocked) __wur; -@@ -108,9 +115,8 @@ extern char *__REDIRECT (__fgets_unlocke - extern __always_inline __wur char * - fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream) - { -- if (__bos (__s) != (size_t) -1 -- && (!__builtin_constant_p (__n) || (size_t) __n > __bos (__s))) -- return __fgets_unlocked_chk (__s, __bos (__s), __n, __stream); -+ if (__bos (__s) != (size_t) -1 && (size_t) __n > __bos (__s)) -+ __chk_fail (); - return __fgets_unlocked_alias (__s, __n, __stream); - } - #endif ---- glibc-20050620T1530/linuxthreads/ChangeLog 17 Jun 2005 22:52:53 -0000 1.852 -+++ glibc-20050620T1530-fedora/linuxthreads/ChangeLog 20 Jun 2005 15:57:54 -0000 1.817.2.29 +--- glibc-20050627T0850/linuxthreads/ChangeLog 17 Jun 2005 22:52:53 -0000 1.852 ++++ glibc-20050627T0850-fedora/linuxthreads/ChangeLog 20 Jun 2005 15:57:54 -0000 1.817.2.29 @@ -7,6 +7,16 @@ * sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S (__vfork): Avoid bl into the GOT when HAVE_ASM_PPC_REL16. @@ -1021,8 +540,8 @@ * descr.h (struct _pthread_descr_struct): Provide p_res member even if USE_TLS && HAVE___THREAD. * sysdeps/pthread/res-state.c (__res_state): Return __resp ---- glibc-20050620T1530/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 -+++ glibc-20050620T1530-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 +--- glibc-20050627T0850/linuxthreads/Makefile 7 Feb 2005 19:30:03 -0000 1.98 ++++ glibc-20050627T0850-fedora/linuxthreads/Makefile 8 Feb 2005 10:04:10 -0000 1.94.2.5 @@ -245,15 +245,18 @@ $(addprefix $(objpfx), \ $(filter-out $(tests-static) $(tests-reverse) unload, \ $(tests) $(test-srcs))): $(objpfx)libpthread.so \ @@ -1044,8 +563,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a ---- glibc-20050620T1530/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 -+++ glibc-20050620T1530-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 +--- glibc-20050627T0850/linuxthreads/cancel.c 22 Feb 2003 00:55:21 -0000 1.23 ++++ glibc-20050627T0850-fedora/linuxthreads/cancel.c 22 Sep 2004 21:20:55 -0000 1.23.2.1 @@ -230,5 +230,6 @@ void __pthread_perform_cleanup(char *cur } @@ -1053,8 +572,8 @@ + THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE); __libc_thread_freeres (); } ---- glibc-20050620T1530/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 -+++ glibc-20050620T1530-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 +--- glibc-20050627T0850/linuxthreads/lockfile.c 18 Dec 2002 01:16:46 -0000 1.10 ++++ glibc-20050627T0850-fedora/linuxthreads/lockfile.c 22 Sep 2004 21:20:55 -0000 1.10.2.1 @@ -74,7 +74,11 @@ __fresetlockfiles (void) __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP); @@ -1068,8 +587,8 @@ __pthread_mutexattr_destroy (&attr); ---- glibc-20050620T1530/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 -+++ glibc-20050620T1530-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 +--- glibc-20050627T0850/linuxthreads/semaphore.h 17 Apr 2004 23:01:39 -0000 1.13 ++++ glibc-20050627T0850-fedora/linuxthreads/semaphore.h 22 Sep 2004 21:20:55 -0000 1.13.2.1 @@ -21,6 +21,7 @@ # define __need_timespec # include @@ -1078,8 +597,8 @@ #ifndef _PTHREAD_DESCR_DEFINED /* Thread descriptors. Needed for `sem_t' definition. */ ---- glibc-20050620T1530/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 -+++ glibc-20050620T1530-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 +--- glibc-20050627T0850/linuxthreads/tst-tls1.h 2 Sep 2003 00:29:30 -0000 1.1 ++++ glibc-20050627T0850-fedora/linuxthreads/tst-tls1.h 22 Sep 2004 21:20:55 -0000 1.1.2.1 @@ -2,7 +2,7 @@ #include #include @@ -1089,8 +608,8 @@ struct tls_obj { ---- glibc-20050620T1530/linuxthreads/man/Makefile 6 Apr 2002 01:04:38 -0000 1.2 -+++ glibc-20050620T1530-fedora/linuxthreads/man/Makefile 30 May 2005 09:15:07 -0000 1.2.2.1 +--- glibc-20050627T0850/linuxthreads/man/Makefile 6 Apr 2002 01:04:38 -0000 1.2 ++++ glibc-20050627T0850-fedora/linuxthreads/man/Makefile 30 May 2005 09:15:07 -0000 1.2.2.1 @@ -1,10 +1,4 @@ -SOURCES=pthread_atfork.man pthread_attr_init.man pthread_cancel.man \ - pthread_cleanup_push.man pthread_cond_init.man \ @@ -1103,8 +622,8 @@ pthread_kill_other_threads_np.man pthread_mutexattr_setkind_np.man MANPAGES=$(SOURCES:.man=.3thr) ---- glibc-20050620T1530/linuxthreads/man/pthread_cleanup_push.man 11 Mar 1998 12:42:23 -0000 1.1 -+++ glibc-20050620T1530-fedora/linuxthreads/man/pthread_cleanup_push.man 30 May 2005 09:15:07 -0000 1.1.6.1 +--- glibc-20050627T0850/linuxthreads/man/pthread_cleanup_push.man 11 Mar 1998 12:42:23 -0000 1.1 ++++ glibc-20050627T0850-fedora/linuxthreads/man/pthread_cleanup_push.man 30 May 2005 09:15:07 -0000 1.1.6.1 @@ -21,7 +21,7 @@ void pthread_cleanup_pop_restore_np(int .SH DESCRIPTION @@ -1154,8 +673,8 @@ a cancellation can occur between !pthread_cleanup_push! and !pthread_mutex_lock!, or between !pthread_mutex_unlock! and !pthread_cleanup_pop!, resulting in both cases in the thread trying to ---- glibc-20050620T1530/linuxthreads/man/pthread_kill_other_threads_np.man 11 Mar 1998 12:42:23 -0000 1.1 -+++ glibc-20050620T1530-fedora/linuxthreads/man/pthread_kill_other_threads_np.man 30 May 2005 09:15:07 -0000 1.1.6.1 +--- glibc-20050627T0850/linuxthreads/man/pthread_kill_other_threads_np.man 11 Mar 1998 12:42:23 -0000 1.1 ++++ glibc-20050627T0850-fedora/linuxthreads/man/pthread_kill_other_threads_np.man 30 May 2005 09:15:07 -0000 1.1.6.1 @@ -16,7 +16,7 @@ called just before a thread calls one of e.g. !execve!(2). @@ -1178,8 +697,8 @@ .SH BUGS ---- glibc-20050620T1530/linuxthreads/man/pthread_mutexattr_setkind_np.man 6 Apr 2002 01:05:27 -0000 1.1 -+++ glibc-20050620T1530-fedora/linuxthreads/man/pthread_mutexattr_setkind_np.man 30 May 2005 09:15:07 -0000 1.1.2.1 +--- glibc-20050627T0850/linuxthreads/man/pthread_mutexattr_setkind_np.man 6 Apr 2002 01:05:27 -0000 1.1 ++++ glibc-20050627T0850-fedora/linuxthreads/man/pthread_mutexattr_setkind_np.man 30 May 2005 09:15:07 -0000 1.1.2.1 @@ -14,8 +14,8 @@ int pthread_mutexattr_getkind_np(const p .SH DESCRIPTION @@ -1199,8 +718,8 @@ -!pthread_mutexattr_gettype!(3). +!pthread_mutexattr_settype!(3p), +!pthread_mutexattr_gettype!(3p). ---- glibc-20050620T1530/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 -+++ glibc-20050620T1530-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 +--- glibc-20050627T0850/linuxthreads/sysdeps/alpha/tls.h 9 Jan 2005 20:01:12 -0000 1.6 ++++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/alpha/tls.h 8 Feb 2005 10:04:11 -0000 1.5.2.2 @@ -58,54 +58,76 @@ typedef struct # include @@ -1290,8 +809,8 @@ /* Get the thread descriptor definition. */ # include ---- glibc-20050620T1530/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 -+++ glibc-20050620T1530-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 +--- glibc-20050627T0850/linuxthreads/sysdeps/i386/tls.h 9 Jan 2005 20:01:13 -0000 1.38 ++++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/i386/tls.h 8 Feb 2005 10:04:12 -0000 1.35.2.5 @@ -86,7 +86,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1308,8 +827,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050620T1530/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 -+++ glibc-20050620T1530-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 +--- glibc-20050627T0850/linuxthreads/sysdeps/ia64/tls.h 9 Jan 2005 20:01:13 -0000 1.10 ++++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/ia64/tls.h 8 Feb 2005 10:04:14 -0000 1.9.2.2 @@ -65,7 +65,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -1326,8 +845,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050620T1530/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 -+++ glibc-20050620T1530-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 +--- glibc-20050627T0850/linuxthreads/sysdeps/powerpc/tls.h 9 Jan 2005 20:01:14 -0000 1.9 ++++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/powerpc/tls.h 8 Feb 2005 10:04:14 -0000 1.8.2.2 @@ -69,11 +69,19 @@ typedef struct # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) @@ -1350,8 +869,8 @@ TCB + 0x7000 (per the ABI). This implies that TCB address is TP - 0x7000. As we define TLS_DTV_AT_TP we can assume that the pthread_descr is allocated immediately ahead of the ---- glibc-20050620T1530/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 -+++ glibc-20050620T1530-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 +--- glibc-20050627T0850/linuxthreads/sysdeps/pthread/Makefile 14 Aug 2003 00:14:22 -0000 1.7 ++++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/pthread/Makefile 22 Sep 2004 21:20:56 -0000 1.7.2.1 @@ -12,3 +12,15 @@ endif ifeq ($(subdir),posix) CFLAGS-confstr.c += -DLIBPTHREAD_VERSION="\"$(shell sed 's/\(.*\) by .*/\1/' ../linuxthreads/Banner)\"" @@ -1368,8 +887,8 @@ + @echo '#define NPTL_STRUCT_PTHREAD_SIZE 0' > $@ +endif +endif ---- glibc-20050620T1530/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050620T1530-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 +--- glibc-20050627T0850/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 22 Sep 2004 21:20:56 -0000 1.1.2.1 @@ -0,0 +1,13 @@ +#ifdef HAVE_TLS_SUPPORT +# ifndef HAVE_FORCED_UNWIND @@ -1384,8 +903,8 @@ +#ifdef HAVE_TLS_SUPPORT +NPTL_STRUCT_PTHREAD_SIZE sizeof (struct pthread) +#endif ---- glibc-20050620T1530/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 -+++ glibc-20050620T1530-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 +--- glibc-20050627T0850/linuxthreads/sysdeps/s390/tls.h 9 Jan 2005 20:01:14 -0000 1.4 ++++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/s390/tls.h 8 Feb 2005 10:04:15 -0000 1.3.2.2 @@ -77,7 +77,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1402,8 +921,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050620T1530/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 -+++ glibc-20050620T1530-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 +--- glibc-20050627T0850/linuxthreads/sysdeps/sh/tls.h 9 Jan 2005 20:01:15 -0000 1.10 ++++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/sh/tls.h 8 Feb 2005 10:04:15 -0000 1.9.2.2 @@ -69,7 +69,14 @@ typedef struct # define TLS_TCB_SIZE sizeof (tcbhead_t) @@ -1420,8 +939,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050620T1530/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 -+++ glibc-20050620T1530-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 +--- glibc-20050627T0850/linuxthreads/sysdeps/sparc/tls.h 9 Jan 2005 20:01:15 -0000 1.4 ++++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/sparc/tls.h 8 Feb 2005 10:04:16 -0000 1.3.2.2 @@ -69,7 +69,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1438,8 +957,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050620T1530/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 -+++ glibc-20050620T1530-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 +--- glibc-20050627T0850/linuxthreads/sysdeps/x86_64/tls.h 9 Jan 2005 20:01:15 -0000 1.7 ++++ glibc-20050627T0850-fedora/linuxthreads/sysdeps/x86_64/tls.h 8 Feb 2005 10:04:16 -0000 1.6.2.2 @@ -71,7 +71,14 @@ typedef struct # define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) @@ -1456,8 +975,8 @@ /* Alignment requirements for the TCB. */ # define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct) ---- glibc-20050620T1530/locale/iso-4217.def 20 Mar 2005 04:14:36 -0000 1.16 -+++ glibc-20050620T1530-fedora/locale/iso-4217.def 24 Mar 2005 08:19:03 -0000 1.15.2.2 +--- glibc-20050627T0850/locale/iso-4217.def 20 Mar 2005 04:14:36 -0000 1.16 ++++ glibc-20050627T0850-fedora/locale/iso-4217.def 24 Mar 2005 08:19:03 -0000 1.15.2.2 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1549,8 +1068,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20050620T1530/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 -+++ glibc-20050620T1530-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 +--- glibc-20050627T0850/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 ++++ glibc-20050627T0850-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 @@ -204,6 +204,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -1594,8 +1113,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20050620T1530/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 -+++ glibc-20050620T1530-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 +--- glibc-20050627T0850/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 ++++ glibc-20050627T0850-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1604,8 +1123,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20050620T1530/localedata/SUPPORTED 28 Apr 2005 14:21:30 -0000 1.75 -+++ glibc-20050620T1530-fedora/localedata/SUPPORTED 3 May 2005 09:28:25 -0000 1.71.2.5 +--- glibc-20050627T0850/localedata/SUPPORTED 28 Apr 2005 14:21:30 -0000 1.75 ++++ glibc-20050627T0850-fedora/localedata/SUPPORTED 3 May 2005 09:28:25 -0000 1.71.2.5 @@ -68,6 +68,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1647,8 +1166,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20050620T1530/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20050620T1530-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20050627T0850/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20050627T0850-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -1663,8 +1182,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20050620T1530/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20050620T1530-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20050627T0850/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20050627T0850-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -1676,8 +1195,8 @@ date_fmt "/ / " ---- glibc-20050620T1530/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 -+++ glibc-20050620T1530-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 +--- glibc-20050627T0850/localedata/locales/en_US 31 Oct 2004 23:42:26 -0000 1.9 ++++ glibc-20050627T0850-fedora/localedata/locales/en_US 2 Nov 2004 12:25:47 -0000 1.7.2.2 @@ -100,7 +100,6 @@ mon " "";/ "";/ @@ -1686,8 +1205,8 @@ % Appropriate date and time representation (%c) % "%a %d %b %Y %r %Z" d_t_fmt "" ---- glibc-20050620T1530/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050620T1530-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20050627T0850/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050627T0850-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1758,8 +1277,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20050620T1530/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20050620T1530-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20050627T0850/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20050627T0850-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1787,32 +1306,9 @@ revision "0.2" date "2000-08-02" % ---- glibc-20050620T1530/math/Versions 28 Mar 2005 20:42:43 -0000 1.9 -+++ glibc-20050620T1530-fedora/math/Versions 26 Feb 2000 01:04:00 -0000 1.8 -@@ -94,7 +94,7 @@ libm { - } - GLIBC_2.1 { - # mathematical functions -- exp2; exp2f; # exp2l; -- bug omitted this until GLIBC_2.4 (below) -+ exp2; exp2f; exp2l; - exp10; exp10f; exp10l; - fdim; fdimf; fdiml; - fma; fmaf; fmal; -@@ -161,11 +161,4 @@ libm { - # fp environment function - feenableexcept; fedisableexcept; fegetexcept; - } -- GLIBC_2.4 { -- # A bug in sysdeps/generic/w_exp2.c kept this from appearing -- # in GLIBC_2.1 as it should have on platforms using that -- # implementation file. On others, sysdeps/CPU/Versions now -- # puts exp2l in GLIBC_2.1, which will override this entry. -- exp2l; -- } - } ---- glibc-20050620T1530/nptl/ChangeLog 17 Jun 2005 22:54:33 -0000 1.784 -+++ glibc-20050620T1530-fedora/nptl/ChangeLog 20 Jun 2005 15:58:02 -0000 1.706.2.49 -@@ -671,6 +671,11 @@ +--- glibc-20050627T0850/nptl/ChangeLog 26 Jun 2005 17:47:05 -0000 1.785 ++++ glibc-20050627T0850-fedora/nptl/ChangeLog 27 Jun 2005 09:15:50 -0000 1.706.2.50 +@@ -693,6 +693,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1824,7 +1320,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -2745,6 +2750,11 @@ +@@ -2767,6 +2772,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1836,9 +1332,9 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20050620T1530/nptl/Makefile 27 Apr 2005 09:55:18 -0000 1.167 -+++ glibc-20050620T1530-fedora/nptl/Makefile 27 Apr 2005 11:31:25 -0000 1.157.2.10 -@@ -499,15 +499,19 @@ $(addprefix $(objpfx), \ +--- glibc-20050627T0850/nptl/Makefile 26 Jun 2005 17:46:19 -0000 1.168 ++++ glibc-20050627T0850-fedora/nptl/Makefile 27 Jun 2005 09:15:50 -0000 1.157.2.11 +@@ -501,15 +501,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a $(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so @@ -1860,24 +1356,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20050620T1530/nptl/descr.h 12 Nov 2004 01:24:24 -0000 1.25 -+++ glibc-20050620T1530-fedora/nptl/descr.h 12 Nov 2004 16:56:12 -0000 1.23.2.3 -@@ -27,9 +27,13 @@ - #include - #include - #include -+#ifdef __need_struct_pthread_size -+#define lll_lock_t int -+#else - #include - #include - #include -+#endif - #include "../nptl_db/thread_db.h" - #include - #ifdef HAVE_FORCED_UNWIND ---- glibc-20050620T1530/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 -+++ glibc-20050620T1530-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 +--- glibc-20050627T0850/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 ++++ glibc-20050627T0850-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 @@ -44,15 +44,35 @@ __pthread_cond_destroy (cond) broadcasted, but still are using the pthread_cond_t structure, pthread_cond_destroy needs to wait for them. */ @@ -1919,8 +1399,8 @@ } return 0; ---- glibc-20050620T1530/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050620T1530-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20050627T0850/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050627T0850-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1928,81 +1408,10 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20050620T1530/nscd/connections.c 28 Apr 2005 06:26:10 -0000 1.67 -+++ glibc-20050620T1530-fedora/nscd/connections.c 28 Apr 2005 09:10:12 -0000 1.55.2.8 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -42,6 +43,7 @@ - #include - #include - #include -+#include - - #include "nscd.h" - #include "dbg_log.h" -@@ -1471,19 +1473,39 @@ start_threads (void) - pthread_condattr_t condattr; - pthread_condattr_init (&condattr); - --#if defined _POSIX_CLOCK_SELECTION && _POSIX_CLOCK_SELECTION >= 0 \ -- && defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0 -+#if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0 - /* Determine whether the monotonous clock is available. */ - struct timespec dummy; - # if _POSIX_MONOTONIC_CLOCK == 0 - if (sysconf (_SC_MONOTONIC_CLOCK) > 0) - # endif --# if _POSIX_CLOCK_SELECTION == 0 -- if (sysconf (_SC_CLOCK_SELECTION) > 0) -+ { -+# if defined _POSIX_CLOCK_SELECTION && _POSIX_CLOCK_SELECTION >= 0 -+# if _POSIX_CLOCK_SELECTION == 0 -+ if (sysconf (_SC_CLOCK_SELECTION) > 0) -+# endif -+ if (clock_getres (CLOCK_MONOTONIC, &dummy) == 0 -+ && pthread_condattr_setclock (&condattr, CLOCK_MONOTONIC) == 0) -+ timeout_clock = CLOCK_MONOTONIC; -+# elif _POSIX_THREADS > 0 -+ if (sysconf (_SC_CLOCK_SELECTION) > 0) -+ { -+ void *h = __libc_dlopen (LIBPTHREAD_SO); -+ int (*condattr_setclock) (pthread_condattr_t *, __clockid_t) = NULL; -+ -+ if (h != NULL) -+ condattr_setclock = __libc_dlsym (h, "pthread_condattr_setclock"); -+ -+ if (condattr_setclock -+ && clock_getres (CLOCK_MONOTONIC, &dummy) == 0 -+ && condattr_setclock (&condattr, CLOCK_MONOTONIC) == 0) -+ timeout_clock = CLOCK_MONOTONIC; -+ -+ if (h != NULL) -+ __libc_dlclose (h); -+ } - # endif -- if (clock_getres (CLOCK_MONOTONIC, &dummy) == 0 -- && pthread_condattr_setclock (&condattr, CLOCK_MONOTONIC) == 0) -- timeout_clock = CLOCK_MONOTONIC; -+ } - #endif - - pthread_cond_init (&readylist_cond, &condattr); -@@ -1548,7 +1570,6 @@ start_threads (void) - main_loop_poll (); - } - -- - /* Look up the uid, gid, and supplementary groups to run nscd as. When - this function is called, we are not listening on the nscd socket yet so - we can just use the ordinary lookup functions without causing a lockup */ -@@ -1617,3 +1638,18 @@ finish_drop_privileges (void) - exit (1); +--- glibc-20050627T0850/nscd/connections.c 20 Jun 2005 15:46:11 -0000 1.68 ++++ glibc-20050627T0850-fedora/nscd/connections.c 27 Jun 2005 13:04:17 -0000 1.55.2.10 +@@ -1617,3 +1617,18 @@ finish_drop_privileges (void) + exit (4); } } + @@ -2020,9 +1429,9 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20050620T1530/nscd/nscd.c 7 Feb 2005 22:51:22 -0000 1.44 -+++ glibc-20050620T1530-fedora/nscd/nscd.c 8 Feb 2005 10:04:34 -0000 1.38.2.5 -@@ -122,9 +122,16 @@ static struct argp argp = +--- glibc-20050627T0850/nscd/nscd.c 20 Jun 2005 15:46:51 -0000 1.45 ++++ glibc-20050627T0850-fedora/nscd/nscd.c 27 Jun 2005 13:04:17 -0000 1.38.2.7 +@@ -122,6 +122,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -2032,14 +1441,7 @@ /* True if only statistics are requested. */ static bool get_stats; -+#ifdef atomic_init_nscd -+atomic_init_nscd -+#endif -+ - int - main (int argc, char **argv) - { -@@ -266,6 +273,7 @@ main (int argc, char **argv) +@@ -266,6 +269,7 @@ main (int argc, char **argv) signal (SIGINT, termination_handler); signal (SIGQUIT, termination_handler); signal (SIGTERM, termination_handler); @@ -2047,8 +1449,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20050620T1530/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 -+++ glibc-20050620T1530-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 +--- glibc-20050627T0850/nscd/nscd.conf 3 Oct 2004 21:09:23 -0000 1.10 ++++ glibc-20050627T0850-fedora/nscd/nscd.conf 4 Oct 2004 08:56:17 -0000 1.8.2.2 @@ -31,8 +31,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -2060,22 +1462,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20050620T1530/nscd/nscd_conf.c 3 Oct 2004 21:10:35 -0000 1.16 -+++ glibc-20050620T1530-fedora/nscd/nscd_conf.c 4 Oct 2004 08:56:17 -0000 1.14.2.2 -@@ -230,7 +230,10 @@ nscd_parse_file (const char *fname, stru - if (strcmp (arg2, "no") == 0) - dbs[cnt].shared = 0; - else if (strcmp (arg2, "yes") == 0) -- dbs[cnt].shared = 1; -+#ifndef atomic_supports_shared -+#define atomic_supports_shared 1 -+#endif -+ dbs[cnt].shared = atomic_supports_shared; - break; - } - if (cnt == lastdb) ---- glibc-20050620T1530/posix/Makefile 14 Apr 2005 21:19:34 -0000 1.184 -+++ glibc-20050620T1530-fedora/posix/Makefile 15 Apr 2005 09:32:51 -0000 1.171.2.12 +--- glibc-20050627T0850/posix/Makefile 14 Apr 2005 21:19:34 -0000 1.184 ++++ glibc-20050627T0850-fedora/posix/Makefile 15 Apr 2005 09:32:51 -0000 1.171.2.12 @@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -2109,8 +1497,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20050620T1530/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050620T1530-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20050627T0850/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050627T0850-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -2127,169 +1515,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20050620T1530/posix/bits/unistd.h 20 Mar 2005 16:48:41 -0000 1.8 -+++ glibc-20050620T1530-fedora/posix/bits/unistd.h 20 Mar 2005 18:12:27 -0000 1.3.2.4 -@@ -21,25 +21,19 @@ - # error "Never include directly; use instead." - #endif - --extern ssize_t __read_chk (int __fd, void *__buf, size_t __nbytes, -- size_t __buflen) __wur; -+extern void __chk_fail (void) __attribute__((__noreturn__)); - extern ssize_t __REDIRECT (__read_alias, (int __fd, void *__buf, - size_t __nbytes), read) __wur; - - extern __always_inline __wur ssize_t - read (int __fd, void *__buf, size_t __nbytes) - { -- if (__bos0 (__buf) != (size_t) -1 -- && (!__builtin_constant_p (__nbytes) || __nbytes > __bos0 (__buf))) -- return __read_chk (__fd, __buf, __nbytes, __bos0 (__buf)); -+ if (__bos0 (__buf) != (size_t) -1 && __nbytes > __bos0 (__buf)) -+ __chk_fail (); - return __read_alias (__fd, __buf, __nbytes); - } - - #ifdef __USE_UNIX98 --extern ssize_t __pread_chk (int __fd, void *__buf, size_t __nbytes, -- __off_t __offset, size_t __bufsize) __wur; --extern ssize_t __pread64_chk (int __fd, void *__buf, size_t __nbytes, -- __off64_t __offset, size_t __bufsize) __wur; - extern ssize_t __REDIRECT (__pread_alias, - (int __fd, void *__buf, size_t __nbytes, - __off_t __offset), pread) __wur; -@@ -51,18 +45,16 @@ extern ssize_t __REDIRECT (__pread64_ali - extern __always_inline __wur ssize_t - pread (int __fd, void *__buf, size_t __nbytes, __off_t __offset) - { -- if (__bos0 (__buf) != (size_t) -1 -- && (!__builtin_constant_p (__nbytes) || __nbytes > __bos0 (__buf))) -- return __pread_chk (__fd, __buf, __nbytes, __offset, __bos0 (__buf)); -+ if (__bos0 (__buf) != (size_t) -1 && __nbytes > __bos0 (__buf)) -+ __chk_fail (); - return __pread_alias (__fd, __buf, __nbytes, __offset); - } - # else - extern __always_inline __wur ssize_t - pread (int __fd, void *__buf, size_t __nbytes, __off64_t __offset) - { -- if (__bos0 (__buf) != (size_t) -1 -- && (!__builtin_constant_p (__nbytes) || __nbytes > __bos0 (__buf))) -- return __pread64_chk (__fd, __buf, __nbytes, __offset, __bos0 (__buf)); -+ if (__bos0 (__buf) != (size_t) -1 && __nbytes > __bos0 (__buf)) -+ __chk_fail (); - return __pread64_alias (__fd, __buf, __nbytes, __offset); - } - # endif -@@ -71,19 +63,14 @@ pread (int __fd, void *__buf, size_t __n - extern __always_inline __wur ssize_t - pread64 (int __fd, void *__buf, size_t __nbytes, __off64_t __offset) - { -- if (__bos0 (__buf) != (size_t) -1 -- && (!__builtin_constant_p (__nbytes) || __nbytes > __bos0 (__buf))) -- return __pread64_chk (__fd, __buf, __nbytes, __offset, __bos0 (__buf)); -+ if (__bos0 (__buf) != (size_t) -1 && __nbytes > __bos0 (__buf)) -+ __chk_fail (); - return __pread64_alias (__fd, __buf, __nbytes, __offset); - } - # endif - #endif - - #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K --extern int __readlink_chk (__const char *__restrict __path, -- char *__restrict __buf, size_t __len, -- size_t __buflen) -- __THROW __nonnull ((1, 2)) __wur; - extern int __REDIRECT_NTH (__readlink_alias, - (__const char *__restrict __path, - char *__restrict __buf, size_t __len), readlink) -@@ -93,38 +80,19 @@ extern __always_inline __nonnull ((1, 2) - __NTH (readlink (__const char *__restrict __path, char *__restrict __buf, - size_t __len)) - { -- if (__bos (__buf) != (size_t) -1 -- && (!__builtin_constant_p (__len) || __len > __bos (__buf))) -- return __readlink_chk (__path, __buf, __len, __bos (__buf)); -+ if (__bos (__buf) != (size_t) -1 && __len > __bos (__buf)) -+ __chk_fail (); - return __readlink_alias (__path, __buf, __len); - } - #endif - --extern char *__getcwd_chk (char *__buf, size_t __size, size_t __buflen) -- __THROW __wur; - extern char *__REDIRECT_NTH (__getcwd_alias, - (char *__buf, size_t __size), getcwd) __wur; - - extern __always_inline __wur char * - __NTH (getcwd (char *__buf, size_t __size)) - { -- if (__bos (__buf) != (size_t) -1 -- && (!__builtin_constant_p (__size) || __size > __bos (__buf))) -- return __getcwd_chk (__buf, __size, __bos (__buf)); -+ if (__bos (__buf) != (size_t) -1 && __size > __bos (__buf)) -+ __chk_fail (); - return __getcwd_alias (__buf, __size); - } -- --#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED --extern char *__getwd_chk (char *__buf, size_t buflen) -- __THROW __nonnull ((1)) __wur; --extern char *__REDIRECT_NTH (__getwd_alias, (char *__buf), getwd) -- __nonnull ((1)) __wur; -- --extern __always_inline __nonnull ((1)) __attribute_deprecated__ __wur char * --__NTH (getwd (char *__buf)) --{ -- if (__bos (__buf) != (size_t) -1) -- return __getwd_chk (__buf, __bos (__buf)); -- return __getwd_alias (__buf); --} --#endif ---- glibc-20050620T1530/socket/bits/socket2.h 19 Mar 2005 00:13:57 -0000 1.5 -+++ glibc-20050620T1530-fedora/socket/bits/socket2.h 19 Mar 2005 20:18:08 -0000 1.2.2.5 -@@ -21,24 +21,18 @@ - # error "Never include directly; use instead." - #endif - --extern ssize_t __recv_chk (int __fd, void *__buf, size_t __n, size_t __buflen, -- int __flags); -+extern void __chk_fail (void) __attribute__((__noreturn__)); - extern ssize_t __REDIRECT (__recv_alias, (int __fd, void *__buf, size_t __n, - int __flags), recv); - - extern __always_inline ssize_t - recv (int __fd, void *__buf, size_t __n, int __flags) - { -- if (__bos0 (__buf) != (size_t) -1 -- && (!__builtin_constant_p (__n) || __n > __bos0 (__buf))) -- return __recv_chk (__fd, __buf, __n, __bos0 (__buf), __flags); -+ if (__bos0 (__buf) != (size_t) -1 && __n > __bos0 (__buf)) -+ __chk_fail (); - return __recv_alias (__fd, __buf, __n, __flags); - } - --extern ssize_t __recvfrom_chk (int __fd, void *__restrict __buf, size_t __n, -- size_t __buflen, int __flags, -- __SOCKADDR_ARG __addr, -- socklen_t *__restrict __addr_len); - extern ssize_t __REDIRECT (__recvfrom_alias, - (int __fd, void *__restrict __buf, size_t __n, - int __flags, __SOCKADDR_ARG __addr, -@@ -48,9 +42,7 @@ extern __always_inline ssize_t - recvfrom (int __fd, void *__buf, size_t __n, int __flags, - __SOCKADDR_ARG __addr, socklen_t *__restrict __addr_len) - { -- if (__bos0 (__buf) != (size_t) -1 -- && (!__builtin_constant_p (__n) || __n > __bos0 (__buf))) -- return __recvfrom_chk (__fd, __buf, __n, __bos0 (__buf), __flags, -- __addr, __addr_len); -+ if (__bos0 (__buf) != (size_t) -1 && __n > __bos0 (__buf)) -+ __chk_fail (); - return __recvfrom_alias (__fd, __buf, __n, __flags, __addr, __addr_len); - } ---- glibc-20050620T1530/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20050620T1530-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20050627T0850/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20050627T0850-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -2305,445 +1532,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20050620T1530/sysdeps/generic/w_exp2.c 28 Mar 2005 20:42:42 -0000 1.3 -+++ glibc-20050620T1530-fedora/sysdeps/generic/w_exp2.c 6 Jun 2001 12:40:16 -0000 1.2 -@@ -31,6 +31,6 @@ __exp2 (double x) /* wrapper exp2 */ - } - weak_alias (__exp2, exp2) - #ifdef NO_LONG_DOUBLE --strong_alias (__exp2, __exp2l) --weak_alias (__exp2, exp2l) -+strong_alias (__exp2, __expl2) -+weak_alias (__exp2, expl2) - #endif ---- glibc-20050620T1530/sysdeps/i386/Versions 28 Mar 2005 20:42:43 -0000 1.5 -+++ glibc-20050620T1530-fedora/sysdeps/i386/Versions 29 Apr 2003 22:47:20 -0000 1.4 -@@ -20,10 +20,3 @@ libc { - __strspn_cg; __strspn_g; __strstr_cg; __strstr_g; - } - } --libm { -- GLIBC_2.1 { -- # A generic bug got this omitted from other configurations' version -- # sets, but we always had it. -- exp2l; -- } --} ---- glibc-20050620T1530/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050620T1530-fedora/sysdeps/i386/bits/atomic.h 5 Oct 2004 12:09:44 -0000 1.1.2.3 -@@ -0,0 +1,410 @@ -+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Ulrich Drepper , 2002. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#include -+ -+ -+typedef int8_t atomic8_t; -+typedef uint8_t uatomic8_t; -+typedef int_fast8_t atomic_fast8_t; -+typedef uint_fast8_t uatomic_fast8_t; -+ -+typedef int16_t atomic16_t; -+typedef uint16_t uatomic16_t; -+typedef int_fast16_t atomic_fast16_t; -+typedef uint_fast16_t uatomic_fast16_t; -+ -+typedef int32_t atomic32_t; -+typedef uint32_t uatomic32_t; -+typedef int_fast32_t atomic_fast32_t; -+typedef uint_fast32_t uatomic_fast32_t; -+ -+typedef int64_t atomic64_t; -+typedef uint64_t uatomic64_t; -+typedef int_fast64_t atomic_fast64_t; -+typedef uint_fast64_t uatomic_fast64_t; -+ -+typedef intptr_t atomicptr_t; -+typedef uintptr_t uatomicptr_t; -+typedef intmax_t atomic_max_t; -+typedef uintmax_t uatomic_max_t; -+ -+ -+#ifndef LOCK_PREFIX -+# ifdef UP -+# define LOCK_PREFIX /* nothing */ -+# else -+# define LOCK_PREFIX "lock;" -+# endif -+#endif -+ -+/* i386 doesn't have cmpxchg* and xadd*. Instead of being completely -+ non-atomic, atomic_* macros that are using solely i386 instructions -+ are using those atomic instructions and the remaining ones are -+ non-atomic. When in nscd, use i486+ instructions if on i486+. */ -+ -+#ifdef IS_IN_nscd -+ -+extern int has_cmpxchg attribute_hidden; -+ -+#define atomic_supports_shared has_cmpxchg -+ -+#define atomic_init_nscd \ -+int has_cmpxchg attribute_hidden; \ -+static void __attribute__((constructor)) \ -+init_has_cmpxchg (void) \ -+{ \ -+ int fl1, fl2; \ -+ __asm__ ("pushfl; pushfl; popl %0; movl %0,%1; xorl %2,%0;" \ -+ "pushl %0; popfl; pushfl; popl %0; popfl" \ -+ : "=&r" (fl1), "=&r" (fl2) : "i" (0x00040000)); \ -+ if ((fl1 ^ fl2) & 0x00040000) \ -+ has_cmpxchg = 1; \ -+} -+ -+# define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \ -+ ({ __typeof (*mem) ret; \ -+ if (__builtin_expect (has_cmpxchg, 1)) \ -+ __asm __volatile (LOCK_PREFIX "cmpxchgb %b2, %1" \ -+ : "=a" (ret), "=m" (*mem) \ -+ : "q" (newval), "m" (*mem), "0" (oldval)); \ -+ else \ -+ { \ -+ ret = *mem; \ -+ if (ret == oldval) \ -+ *mem = (newval); \ -+ } \ -+ ret; }) -+ -+# define __arch_compare_and_exchange_val_16_acq(mem, newval, oldval) \ -+ ({ __typeof (*mem) ret; \ -+ if (__builtin_expect (has_cmpxchg, 1)) \ -+ __asm __volatile (LOCK_PREFIX "cmpxchgw %w2, %1" \ -+ : "=a" (ret), "=m" (*mem) \ -+ : "r" (newval), "m" (*mem), "0" (oldval)); \ -+ else \ -+ { \ -+ ret = *mem; \ -+ if (ret == oldval) \ -+ *mem = (newval); \ -+ } \ -+ ret; }) -+ -+# define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \ -+ ({ __typeof (*mem) ret; \ -+ if (__builtin_expect (has_cmpxchg, 1)) \ -+ __asm __volatile (LOCK_PREFIX "cmpxchgl %2, %1" \ -+ : "=a" (ret), "=m" (*mem) \ -+ : "r" (newval), "m" (*mem), "0" (oldval)); \ -+ else \ -+ { \ -+ ret = *mem; \ -+ if (ret == oldval) \ -+ *mem = (newval); \ -+ } \ -+ ret; }) -+ -+/* XXX We do not really need 64-bit compare-and-exchange. At least -+ not in the moment. */ -+# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \ -+ ({ __typeof (*mem) ret = *(mem); abort (); ret = (newval); ret = (oldval); }) -+ -+ -+# define atomic_exchange_and_add(mem, value) \ -+ ({ __typeof (*mem) __result; \ -+ __typeof (value) __addval = (value); \ -+ if (__builtin_expect (! has_cmpxchg, 0)) \ -+ { \ -+ __typeof (mem) __memp = (mem); \ -+ __result = *__memp; \ -+ *__memp += __addval; \ -+ } \ -+ else if (sizeof (*mem) == 1) \ -+ __asm __volatile (LOCK_PREFIX "xaddb %b0, %1" \ -+ : "=r" (__result), "=m" (*mem) \ -+ : "0" (__addval), "m" (*mem)); \ -+ else if (sizeof (*mem) == 2) \ -+ __asm __volatile (LOCK_PREFIX "xaddw %w0, %1" \ -+ : "=r" (__result), "=m" (*mem) \ -+ : "0" (__addval), "m" (*mem)); \ -+ else if (sizeof (*mem) == 4) \ -+ __asm __volatile (LOCK_PREFIX "xaddl %0, %1" \ -+ : "=r" (__result), "=m" (*mem) \ -+ : "0" (__addval), "m" (*mem)); \ -+ else \ -+ { \ -+ __typeof (mem) __memp = (mem); \ -+ __typeof (*mem) __tmpval; \ -+ __result = *__memp; \ -+ do \ -+ __tmpval = __result; \ -+ while ((__result = __arch_compare_and_exchange_val_64_acq \ -+ (__memp, __result + __addval, __result)) == __tmpval); \ -+ } \ -+ __result; }) -+ -+#else -+ -+/* We have by default no support for atomic operations. So define -+ them non-atomic. If this is a problem somebody will have to come -+ up with real definitions. */ -+ -+/* The only basic operation needed is compare and exchange. */ -+#define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \ -+ ({ __typeof (mem) __gmemp = (mem); \ -+ __typeof (*mem) __gret = *__gmemp; \ -+ __typeof (*mem) __gnewval = (newval); \ -+ \ -+ if (__gret == (oldval)) \ -+ *__gmemp = __gnewval; \ -+ __gret; }) -+ -+#define atomic_compare_and_exchange_bool_acq(mem, newval, oldval) \ -+ ({ __typeof (mem) __gmemp = (mem); \ -+ __typeof (*mem) __gnewval = (newval); \ -+ \ -+ *__gmemp == (oldval) ? (*__gmemp = __gnewval, 0) : 1; }) -+ -+/* XXX We do not really need 64-bit compare-and-exchange. At least -+ not in the moment. */ -+# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \ -+ ({ __typeof (*mem) ret = *(mem); abort (); ret = (newval); ret = (oldval); }) -+ -+#endif -+ -+/* Note that we need no lock prefix. */ -+#define atomic_exchange_acq(mem, newvalue) \ -+ ({ __typeof (*mem) result; \ -+ if (sizeof (*mem) == 1) \ -+ __asm __volatile ("xchgb %b0, %1" \ -+ : "=r" (result), "=m" (*mem) \ -+ : "0" (newvalue), "m" (*mem)); \ -+ else if (sizeof (*mem) == 2) \ -+ __asm __volatile ("xchgw %w0, %1" \ -+ : "=r" (result), "=m" (*mem) \ -+ : "0" (newvalue), "m" (*mem)); \ -+ else if (sizeof (*mem) == 4) \ -+ __asm __volatile ("xchgl %0, %1" \ -+ : "=r" (result), "=m" (*mem) \ -+ : "0" (newvalue), "m" (*mem)); \ -+ else \ -+ { \ -+ result = 0; \ -+ abort (); \ -+ } \ -+ result; }) -+ -+ -+#define atomic_add(mem, value) \ -+ (void) ({ if (__builtin_constant_p (value) && (value) == 1) \ -+ atomic_increment (mem); \ -+ else if (__builtin_constant_p (value) && (value) == -1) \ -+ atomic_decrement (mem); \ -+ else if (sizeof (*mem) == 1) \ -+ __asm __volatile (LOCK_PREFIX "addb %b1, %0" \ -+ : "=m" (*mem) \ -+ : "ir" (value), "m" (*mem)); \ -+ else if (sizeof (*mem) == 2) \ -+ __asm __volatile (LOCK_PREFIX "addw %w1, %0" \ -+ : "=m" (*mem) \ -+ : "ir" (value), "m" (*mem)); \ -+ else if (sizeof (*mem) == 4) \ -+ __asm __volatile (LOCK_PREFIX "addl %1, %0" \ -+ : "=m" (*mem) \ -+ : "ir" (value), "m" (*mem)); \ -+ else \ -+ { \ -+ __typeof (value) __addval = (value); \ -+ __typeof (mem) __memp = (mem); \ -+ __typeof (*mem) __oldval = *__memp; \ -+ __typeof (*mem) __tmpval; \ -+ do \ -+ __tmpval = __oldval; \ -+ while ((__oldval = __arch_compare_and_exchange_val_64_acq \ -+ (__memp, __oldval + __addval, __oldval)) == __tmpval); \ -+ } \ -+ }) -+ -+ -+#define atomic_add_negative(mem, value) \ -+ ({ unsigned char __result; \ -+ if (sizeof (*mem) == 1) \ -+ __asm __volatile (LOCK_PREFIX "addb %b2, %0; sets %1" \ -+ : "=m" (*mem), "=qm" (__result) \ -+ : "iq" (value), "m" (*mem)); \ -+ else if (sizeof (*mem) == 2) \ -+ __asm __volatile (LOCK_PREFIX "addw %w2, %0; sets %1" \ -+ : "=m" (*mem), "=qm" (__result) \ -+ : "ir" (value), "m" (*mem)); \ -+ else if (sizeof (*mem) == 4) \ -+ __asm __volatile (LOCK_PREFIX "addl %2, %0; sets %1" \ -+ : "=m" (*mem), "=qm" (__result) \ -+ : "ir" (value), "m" (*mem)); \ -+ else \ -+ abort (); \ -+ __result; }) -+ -+ -+#define atomic_add_zero(mem, value) \ -+ ({ unsigned char __result; \ -+ if (sizeof (*mem) == 1) \ -+ __asm __volatile (LOCK_PREFIX "addb %b2, %0; setz %1" \ -+ : "=m" (*mem), "=qm" (__result) \ -+ : "ir" (value), "m" (*mem)); \ -+ else if (sizeof (*mem) == 2) \ -+ __asm __volatile (LOCK_PREFIX "addw %w2, %0; setz %1" \ -+ : "=m" (*mem), "=qm" (__result) \ -+ : "ir" (value), "m" (*mem)); \ -+ else if (sizeof (*mem) == 4) \ -+ __asm __volatile (LOCK_PREFIX "addl %2, %0; setz %1" \ -+ : "=m" (*mem), "=qm" (__result) \ -+ : "ir" (value), "m" (*mem)); \ -+ else \ -+ abort (); \ -+ __result; }) -+ -+ -+#define atomic_increment(mem) \ -+ (void) ({ if (sizeof (*mem) == 1) \ -+ __asm __volatile (LOCK_PREFIX "incb %b0" \ -+ : "=m" (*mem) \ -+ : "m" (*mem)); \ -+ else if (sizeof (*mem) == 2) \ -+ __asm __volatile (LOCK_PREFIX "incw %w0" \ -+ : "=m" (*mem) \ -+ : "m" (*mem)); \ -+ else if (sizeof (*mem) == 4) \ -+ __asm __volatile (LOCK_PREFIX "incl %0" \ -+ : "=m" (*mem) \ -+ : "m" (*mem)); \ -+ else \ -+ { \ -+ __typeof (mem) __memp = (mem); \ -+ __typeof (*mem) __oldval = *__memp; \ -+ __typeof (*mem) __tmpval; \ -+ do \ -+ __tmpval = __oldval; \ -+ while ((__oldval = __arch_compare_and_exchange_val_64_acq \ -+ (__memp, __oldval + 1, __oldval)) == __tmpval); \ -+ } \ -+ }) -+ -+ -+#define atomic_increment_and_test(mem) \ -+ ({ unsigned char __result; \ -+ if (sizeof (*mem) == 1) \ -+ __asm __volatile (LOCK_PREFIX "incb %0; sete %b1" \ -+ : "=m" (*mem), "=qm" (__result) \ -+ : "m" (*mem)); \ -+ else if (sizeof (*mem) == 2) \ -+ __asm __volatile (LOCK_PREFIX "incw %0; sete %w1" \ -+ : "=m" (*mem), "=qm" (__result) \ -+ : "m" (*mem)); \ -+ else if (sizeof (*mem) == 4) \ -+ __asm __volatile (LOCK_PREFIX "incl %0; sete %1" \ -+ : "=m" (*mem), "=qm" (__result) \ -+ : "m" (*mem)); \ -+ else \ -+ abort (); \ -+ __result; }) -+ -+ -+#define atomic_decrement(mem) \ -+ (void) ({ if (sizeof (*mem) == 1) \ -+ __asm __volatile (LOCK_PREFIX "decb %b0" \ -+ : "=m" (*mem) \ -+ : "m" (*mem)); \ -+ else if (sizeof (*mem) == 2) \ -+ __asm __volatile (LOCK_PREFIX "decw %w0" \ -+ : "=m" (*mem) \ -+ : "m" (*mem)); \ -+ else if (sizeof (*mem) == 4) \ -+ __asm __volatile (LOCK_PREFIX "decl %0" \ -+ : "=m" (*mem) \ -+ : "m" (*mem)); \ -+ else \ -+ { \ -+ __typeof (mem) __memp = (mem); \ -+ __typeof (*mem) __oldval = *__memp; \ -+ __typeof (*mem) __tmpval; \ -+ do \ -+ __tmpval = __oldval; \ -+ while ((__oldval = __arch_compare_and_exchange_val_64_acq \ -+ (__memp, __oldval - 1, __oldval)) == __tmpval); \ -+ } \ -+ }) -+ -+ -+#define atomic_decrement_and_test(mem) \ -+ ({ unsigned char __result; \ -+ if (sizeof (*mem) == 1) \ -+ __asm __volatile (LOCK_PREFIX "decb %b0; sete %1" \ -+ : "=m" (*mem), "=qm" (__result) \ -+ : "m" (*mem)); \ -+ else if (sizeof (*mem) == 2) \ -+ __asm __volatile (LOCK_PREFIX "decw %w0; sete %1" \ -+ : "=m" (*mem), "=qm" (__result) \ -+ : "m" (*mem)); \ -+ else if (sizeof (*mem) == 4) \ -+ __asm __volatile (LOCK_PREFIX "decl %0; sete %1" \ -+ : "=m" (*mem), "=qm" (__result) \ -+ : "m" (*mem)); \ -+ else \ -+ abort (); \ -+ __result; }) -+ -+ -+#define atomic_bit_set(mem, bit) \ -+ (void) ({ if (sizeof (*mem) == 1) \ -+ __asm __volatile (LOCK_PREFIX "orb %b2, %0" \ -+ : "=m" (*mem) \ -+ : "m" (*mem), "ir" (1 << (bit))); \ -+ else if (sizeof (*mem) == 2) \ -+ __asm __volatile (LOCK_PREFIX "orw %w2, %0" \ -+ : "=m" (*mem) \ -+ : "m" (*mem), "ir" (1 << (bit))); \ -+ else if (sizeof (*mem) == 4) \ -+ __asm __volatile (LOCK_PREFIX "orl %2, %0" \ -+ : "=m" (*mem) \ -+ : "m" (*mem), "ir" (1 << (bit))); \ -+ else \ -+ abort (); \ -+ }) -+ -+ -+#define atomic_bit_test_set(mem, bit) \ -+ ({ unsigned char __result; \ -+ if (sizeof (*mem) == 1) \ -+ __asm __volatile (LOCK_PREFIX "btsb %3, %1; setc %0" \ -+ : "=q" (__result), "=m" (*mem) \ -+ : "m" (*mem), "ir" (bit)); \ -+ else if (sizeof (*mem) == 2) \ -+ __asm __volatile (LOCK_PREFIX "btsw %3, %1; setc %0" \ -+ : "=q" (__result), "=m" (*mem) \ -+ : "m" (*mem), "ir" (bit)); \ -+ else if (sizeof (*mem) == 4) \ -+ __asm __volatile (LOCK_PREFIX "btsl %3, %1; setc %0" \ -+ : "=q" (__result), "=m" (*mem) \ -+ : "m" (*mem), "ir" (bit)); \ -+ else \ -+ abort (); \ -+ __result; }) -+ -+ -+#define atomic_delay() asm ("rep; nop") ---- glibc-20050620T1530/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20050620T1530-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20050627T0850/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20050627T0850-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -2755,21 +1545,8 @@ endif endif ---- glibc-20050620T1530/sysdeps/ia64/Versions 28 Mar 2005 20:42:43 -0000 1.10 -+++ glibc-20050620T1530-fedora/sysdeps/ia64/Versions 3 May 2002 07:10:31 -0000 1.9 -@@ -12,10 +12,3 @@ libc { - __multi3; - } - } --libm { -- GLIBC_2.1 { -- # A generic bug got this omitted from other configurations' version -- # sets, but we always had it. -- exp2l; -- } --} ---- glibc-20050620T1530/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20050620T1530-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20050627T0850/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20050627T0850-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -3121,8 +1898,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20050620T1530/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050620T1530-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050627T0850/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050627T0850-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -3208,44 +1985,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20050620T1530/sysdeps/m68k/Versions 28 Mar 2005 20:42:42 -0000 1.2 -+++ glibc-20050620T1530-fedora/sysdeps/m68k/Versions 29 Jan 1999 09:06:03 -0000 1.1 -@@ -4,10 +4,3 @@ libc { - __divdi3; __moddi3; __udivdi3; __umoddi3; - } - } --libm { -- GLIBC_2.1 { -- # A generic bug got this omitted from other configurations' version -- # sets, but we always had it. -- exp2l; -- } --} ---- glibc-20050620T1530/sysdeps/mips/mips64/Versions 28 Mar 2005 20:42:43 -0000 1.1 -+++ glibc-20050620T1530-fedora/sysdeps/mips/mips64/Versions 1 Jan 1970 00:00:00 -0000 -@@ -1,7 +0,0 @@ --libm { -- GLIBC_2.1 { -- # A generic bug got this omitted from other configurations' version -- # sets, but we always had it. -- exp2l; -- } --} ---- glibc-20050620T1530/sysdeps/sparc/sparc64/Versions 28 Mar 2005 20:42:42 -0000 1.2 -+++ glibc-20050620T1530-fedora/sysdeps/sparc/sparc64/Versions 19 May 1999 14:21:36 -0000 1.1 -@@ -5,10 +5,3 @@ libc { - __align_cpy_8; __align_cpy_16; - } - } --libm { -- GLIBC_2.1 { -- # A generic bug got this omitted from other configurations' version -- # sets, but we always had it. -- exp2l; -- } --} ---- glibc-20050620T1530/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20050620T1530-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20050627T0850/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20050627T0850-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -3260,8 +2001,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20050620T1530/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20050620T1530-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20050627T0850/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -3271,8 +2012,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20050620T1530/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 -+++ glibc-20050620T1530-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 +--- glibc-20050627T0850/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 ++++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 @@ -33,7 +33,10 @@ __readonly_area (const char *ptr, size_t FILE *fp = fopen ("/proc/self/maps", "rc"); @@ -3285,8 +2026,8 @@ /* We need no locking. */ __fsetlocking (fp, FSETLOCKING_BYCALLER); ---- glibc-20050620T1530/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20050620T1530-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20050627T0850/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -3332,8 +2073,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20050620T1530/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050620T1530-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20050627T0850/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -3394,8 +2135,8 @@ + } while (0) + +#include_next ---- glibc-20050620T1530/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20050620T1530-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20050627T0850/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -3428,34 +2169,24 @@ + } while (0) + #include_next ---- glibc-20050620T1530/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050620T1530-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050627T0850/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20050620T1530/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050620T1530-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20050627T0850/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20050620T1530/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20050620T1530-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20050627T0850/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20050627T0850-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-20050620T1530/sysdeps/x86_64/Versions 28 Mar 2005 20:42:42 -0000 1.3 -+++ glibc-20050620T1530-fedora/sysdeps/x86_64/Versions 1 Jan 1970 00:00:00 -0000 -@@ -1,7 +0,0 @@ --libm { -- GLIBC_2.1 { -- # A generic bug got this omitted from other configurations' version -- # sets, but we always had it. -- exp2l; -- } --} diff --git a/glibc.spec b/glibc.spec index 327cefa..064158e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,13 +1,11 @@ -%define glibcdate 20050620T1530 +%define glibcdate 20050627T0850 %define glibcname glibc -%define glibcsrcdir glibc-20050620T1530 +%define glibcsrcdir glibc-20050627T0850 %define glibc_release_tarballs 0 -%define glibcversion 2.3.5 -%define glibcrelease 11 +%define glibcversion 2.3.90 +%define glibcrelease 1 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch -%define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 sparc64 ppc ppc64 -%define withtlsarches i386 i686 athlon x86_64 ia64 s390 s390x alpha alphaev6 sparc sparcv9 sparc64 ppc ppc64 %define xenarches i686 athlon %ifarch %{xenarches} %define buildxen 1 @@ -33,12 +31,11 @@ Source2: %(echo %{glibcsrcdir} | sed s/glibc-/glibc-libidn-/).tar.bz2 %endif Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2 Patch0: %{glibcname}-fedora.patch -Patch1: %{name}-nptl-check.patch -Patch2: %{name}-ppc-assume.patch -Patch3: %{name}-ia64-lib64.patch +Patch1: %{name}-ppc-assume.patch +Patch2: %{name}-ia64-lib64.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, -Obsoletes: linuxthreads, gencat, locale, ldconfig, locale-ja +Obsoletes: gencat, locale, ldconfig, locale-ja Provides: ldconfig Autoreq: false Requires: glibc-common = %{version}-%{release} @@ -64,28 +61,13 @@ Conflicts: gcc4 <= 4.0.0-0.6 # /etc/default Conflicts: shadow-utils < 2:4.0.3-20 Conflicts: nscd < 2.3.3-52 -%ifarch ia64 sparc64 s390x x86_64 -Conflicts: kernel < 2.4.0 -%define enablekernel 2.4.0 -%else -%ifarch ppc64 -Conflicts: kernel < 2.4.19 -%define enablekernel 2.4.19 -%else -%define enablekernel 2.2.5 -%ifarch i686 athlon -%define enablekernelltfs 2.4.1 -%endif -%endif -%endif -%ifarch %{nptlarches} -%define enablekernelnptl 2.4.20 +Conflicts: kernel < 2.4.20 +%define enablekernel 2.4.20 %ifarch i386 %define nptl_target_cpu i486 %else %define nptl_target_cpu %{_target_cpu} %endif -%endif # Need AS_NEEDED directive BuildRequires: binutils >= 2.15.94.0.2-1 BuildRequires: gcc >= 3.2.1-5 @@ -173,24 +155,6 @@ executables. Install glibc-headers if you are going to develop programs which will use the standard C libraries. -%ifarch %{nptlarches} -%ifnarch %{auxarches} -%package -n linuxthreads-devel -Summary: Header files and static libraries for development using LinuxThreads library. -Group: Development/Libraries -Requires: glibc-devel = %{version}-%{release} -Autoreq: true - -%description -n linuxthreads-devel -The linuxthreads-devel package contains the header and object files necessary -for developing programs which can use the LinuxThreads library (normally -newly linked programs will work only with NPTL). To compile and link -a program against LinuxThreads libraries, use --I/usr/include/linuxthreads -L/usr/%{_lib}/linuxthreads \\ --Wl,-rpath-link,/%{_lib}/obsolete/linuxthreads -%endif -%endif - %package profile Summary: The GNU libc libraries, including support for gprof profiling. Group: Development/Libraries @@ -288,20 +252,10 @@ package or when debugging this package. %prep %setup -q -n %{glibcsrcdir} %{glibc_release_unpack} -a3 %patch0 -E -p1 -case "`gcc --version | head -1`" in -gcc*\ 3.[34]*) -%ifarch %{nptlarches} %patch1 -p1 -%endif - ;; -gcc*\ 3.2.3*) - case "`uname -r`" in *.ent*|*.EL*) -%patch2 -p1 - ;; esac ;; -esac %ifarch ia64 %if "%{_lib}" == "lib64" -%patch3 -p1 +%patch2 -p1 %endif %endif @@ -476,10 +430,6 @@ cat > asm/unistd.h </dev/null; then - sed -ie 's/0 [|][|]/1 ||/' ../elf/tst-tls10.h ../linuxthreads/tst-tls1.h -fi - BuildFlags="$BuildFlags -DNDEBUG=1" if gcc -v 2>&1 | grep -q 'gcc version 3.[0123]'; then BuildFlags="$BuildFlags -finline-limit=2000" @@ -538,27 +480,38 @@ EnableKernel="--enable-kernel=%{enablekernel}" echo "$BuildFlags" > ../BuildFlags echo "$GCC" > ../Gcc AddOns=`cd .. && echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'` -echo "$AddOns" > ../AddOns -Pthreads=linuxthreads -%ifarch %{withtlsarches} -WithTls="--with-tls --without-__thread" -%else -WithTls="--without-tls --without-__thread" +%ifarch %{rtkaioarches} +AddOns=,rtkaio$AddOns %endif -CC="$GCC" CFLAGS="$BuildFlags -g -O3" ../configure --prefix=%{_prefix} \ - --enable-add-ons=$Pthreads$AddOns --without-cvs $EnableKernel \ +echo "$AddOns" > ../AddOns + +build_nptl() +{ +builddir=build-%{nptl_target_cpu}-$1 +shift +rm -rf $builddir +mkdir $builddir ; cd $builddir +build_CFLAGS="$BuildFlags -g -O3 $*" +CC="$GCC" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \ + --enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \ --with-headers=%{_prefix}/include --enable-bind-now \ - $WithTls --build %{_target_cpu}-redhat-linux --host %{_target_cpu}-redhat-linux -if [ -x /usr/bin/getconf ] ; then - numprocs=$(/usr/bin/getconf _NPROCESSORS_ONLN) - if [ $numprocs -eq 0 ]; then - numprocs=1 - fi -else - numprocs=1 -fi -make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s + --with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \ + --host %{nptl_target_cpu}-redhat-linux +make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s + +cd .. +} + +build_nptl linuxnptl + +%if %{buildxen} +EnableKernel="$EnableKernel --disable-profile" +build_nptl linuxnptl-nosegneg -mno-tls-direct-seg-refs +%endif + +cd build-%{nptl_target_cpu}-linuxnptl $GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \ + -DNO_SIZE_OPTIMIZATION \ %ifarch i386 -DARCH_386 \ %endif @@ -568,190 +521,43 @@ $GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_tar '-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"' cd .. -# hack -unset LD_ASSUME_KERNEL || : - -%ifarch %{rtkaioarches} -AddOns=,rtkaio$AddOns -%endif - -%ifarch i686 athlon -rm -rf build-%{_target_cpu}-linuxltfs -mkdir build-%{_target_cpu}-linuxltfs ; cd build-%{_target_cpu}-linuxltfs -EnableKernel="--enable-kernel=%{enablekernelltfs} --disable-profile" -Pthreads=linuxthreads -%ifarch %{withtlsarches} -WithTls="--with-tls --without-__thread" -%else -WithTls="--without-tls --without-__thread" -%endif -CC="$GCC" CFLAGS="$BuildFlags -g -O3" ../configure --prefix=%{_prefix} \ - --enable-add-ons=$Pthreads$AddOns --without-cvs $EnableKernel \ - --with-headers=%{_prefix}/include --enable-bind-now \ - $WithTls --build %{_target_cpu}-redhat-linux --host %{_target_cpu}-redhat-linux -make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s - -cd .. -%endif - -%ifarch %{nptlarches} -build_nptl() -{ -builddir=build-%{nptl_target_cpu}-$1 -shift -rm -rf $builddir -mkdir $builddir ; cd $builddir -EnableKernel="--enable-kernel=%{enablekernelnptl} --disable-profile" -Pthreads=nptl -WithTls="--with-tls --with-__thread" -build_CFLAGS="$BuildFlags -g -O3 $*" -CC="$GCC" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \ - --enable-add-ons=$Pthreads$AddOns --without-cvs $EnableKernel \ - --with-headers=%{_prefix}/include --enable-bind-now \ - $WithTls --build %{nptl_target_cpu}-redhat-linux --host %{nptl_target_cpu}-redhat-linux -make -j$numprocs -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s - -cd .. -} - -build_nptl linuxnptl - -%if %{buildxen} -build_nptl linuxnptl-nosegneg -mno-tls-direct-seg-refs -%endif -%endif - %install -# hack -unset LD_ASSUME_KERNEL || : - BuildFlags=`cat BuildFlags` GCC=`cat Gcc` AddOns=`cat AddOns` -%ifarch %{rtkaioarches} -AddOns=,rtkaio$AddOns -%endif - -if [ -x /usr/bin/getconf ] ; then - numprocs=$(/usr/bin/getconf _NPROCESSORS_ONLN) - if [ $numprocs -eq 0 ]; then - numprocs=1 - fi -else - numprocs=1 -fi rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT -make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{_target_cpu}-linux PARALLELMFLAGS=-s +make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl PARALLELMFLAGS=-s %ifnarch %{auxarches} -cd build-%{_target_cpu}-linux && \ - make -j$numprocs install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \ +cd build-%{nptl_target_cpu}-linuxnptl && \ + make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \ cd .. %endif -SubDir= - -%ifarch i686 athlon -cd build-%{_target_cpu}-linuxltfs -Pthreads=linuxthreads -%ifarch %{nptlarches} -SubDir=obsolete/linuxthreads/i686 -%else -SubDir=i686 -%endif -mkdir -p $RPM_BUILD_ROOT/lib/$SubDir/ -cp -a libc.so $RPM_BUILD_ROOT/lib/$SubDir/`basename $RPM_BUILD_ROOT/lib/libc-*.so` -ln -sf `basename $RPM_BUILD_ROOT/lib/libc-*.so` $RPM_BUILD_ROOT/lib/$SubDir/`basename $RPM_BUILD_ROOT/lib/libc.so.*` -cp -a math/libm.so $RPM_BUILD_ROOT/lib/$SubDir/`basename $RPM_BUILD_ROOT/lib/libm-*.so` -ln -sf `basename $RPM_BUILD_ROOT/lib/libm-*.so` $RPM_BUILD_ROOT/lib/$SubDir/`basename $RPM_BUILD_ROOT/lib/libm.so.*` -cp -a $Pthreads/libpthread.so $RPM_BUILD_ROOT/lib/$SubDir/`basename $RPM_BUILD_ROOT/lib/libpthread-*.so` -pushd $RPM_BUILD_ROOT/lib/$SubDir -ln -sf libpthread-*.so `basename $RPM_BUILD_ROOT/lib/libpthread.so.*` -popd -%ifarch %{rtkaioarches} -cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/lib/$SubDir/`basename $RPM_BUILD_ROOT/lib/librt-*.so | sed s/librt-/librtkaio-/` -ln -sf `basename $RPM_BUILD_ROOT/lib/librt-*.so | sed s/librt-/librtkaio-/` $RPM_BUILD_ROOT/lib/$SubDir/`basename $RPM_BUILD_ROOT/lib/librt.so.*` -%else -cp -a rt/librt.so $RPM_BUILD_ROOT/lib/$SubDir/`basename $RPM_BUILD_ROOT/lib/librt-*.so` -ln -sf `basename $RPM_BUILD_ROOT/lib/librt-*.so` $RPM_BUILD_ROOT/lib/$SubDir/`basename $RPM_BUILD_ROOT/lib/librt.so.*` -%endif - -cd .. -%endif - -%ifarch %{nptlarches} -ObsDir=obsolete/linuxthreads -mkdir -p $RPM_BUILD_ROOT/%{_lib}/obsolete/linuxthreads -mv -f $RPM_BUILD_ROOT/%{_lib}/lib{c,m,pthread,rt,thread_db}[.-]*so* $RPM_BUILD_ROOT/%{_lib}/obsolete/linuxthreads/ - -install_nptl() { -cd build-%{nptl_target_cpu}-$1 -Pthreads=nptl -SubDir=$2 -mkdir -p $RPM_BUILD_ROOT/%{_lib}/$SubDir/ -cp -a libc.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libc-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libc-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libc.so.*` -cp -a math/libm.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libm-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libm-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libm.so.*` -cp -a $Pthreads/libpthread.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/libpthread-%{version}.so -pushd $RPM_BUILD_ROOT/%{_lib}/$SubDir -ln -sf libpthread-*.so `basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libpthread.so.*` -popd -%ifarch %{rtkaioarches} -cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/librt-*.so | sed s/librt-/librtkaio-/` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/librt-*.so | sed s/librt-/librtkaio-/` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/librt.so.*` -%else -cp -a rt/librt.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/librt-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/librt.so.*` -%endif -cp -a ${Pthreads}_db/libthread_db.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libthread_db-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libthread_db-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/$ObsDir/libthread_db.so.*` -} - -install_nptl linuxnptl - -mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{_lib}/linuxthreads -mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/{libc,libpthread,libpthread_nonshared,librt}.a \ - $RPM_BUILD_ROOT%{_prefix}/%{_lib}/linuxthreads/ -cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \ - $RPM_BUILD_ROOT%{_prefix}/%{_lib}/ -sed "s| /%{_lib}/| /%{_lib}/$ObsDir/|" $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libc.so \ - > $RPM_BUILD_ROOT%{_prefix}/%{_lib}/linuxthreads/libc.so -sed "s| /%{_lib}/| /%{_lib}/$ObsDir/|;s|/libpthread_nonshared|/linuxthreads&|" $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libpthread.so \ - > $RPM_BUILD_ROOT%{_prefix}/%{_lib}/linuxthreads/libpthread.so -%ifarch %{rtkaioarches} -ln -sf /%{_lib}/$ObsDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed 's/librt-/librtkaio-/'` \ - $RPM_BUILD_ROOT%{_prefix}/%{_lib}/linuxthreads/librt.so -%else -ln -sf /%{_lib}/$ObsDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` \ - $RPM_BUILD_ROOT%{_prefix}/%{_lib}/linuxthreads/librt.so -%endif -strip -g $RPM_BUILD_ROOT%{_prefix}/%{_lib}/linuxthreads/*.a -mkdir -p $RPM_BUILD_ROOT/nptl $RPM_BUILD_ROOT%{_prefix}/include/linuxthreads -make -j1 install_root=$RPM_BUILD_ROOT/nptl install-headers PARALLELMFLAGS=-s -pushd $RPM_BUILD_ROOT/nptl%{_prefix}/include - for i in `find . -type f`; do - if ! [ -f $RPM_BUILD_ROOT%{_prefix}/include/$i ] \ - || ! cmp -s $i $RPM_BUILD_ROOT%{_prefix}/include/$i; then - mkdir -p $RPM_BUILD_ROOT%{_prefix}/include/linuxthreads/`dirname $i` - if [ -f $RPM_BUILD_ROOT%{_prefix}/include/$i ]; then - cp -a $RPM_BUILD_ROOT%{_prefix}/include/{,linuxthreads/}$i - fi - cp -a $i $RPM_BUILD_ROOT%{_prefix}/include/$i - fi - done -popd -rm -rf $RPM_BUILD_ROOT/nptl - -cd .. - %if %{buildxen} %define nosegneg_subdir i686/nosegneg -install_nptl linuxnptl-nosegneg %{nosegneg_subdir} -cd .. +cd build-%{nptl_target_cpu}-linuxnptl-nosegneg +SubDir=%{nosegneg_subdir} +mkdir -p $RPM_BUILD_ROOT/%{_lib}/$SubDir/ +cp -a libc.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` +ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libc.so.*` +cp -a math/libm.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so` +ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libm.so.*` +cp -a nptl/libpthread.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/libpthread-%{version}.so +pushd $RPM_BUILD_ROOT/%{_lib}/$SubDir +ln -sf libpthread-*.so `basename $RPM_BUILD_ROOT/%{_lib}/libpthread.so.*` +popd +%ifarch %{rtkaioarches} +cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` +ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` +%else +cp -a rt/librt.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` +ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` %endif - +cp -a nptl_db/libthread_db.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` +ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db.so.*` +cd .. %endif # compatibility hack: this locale has vanished from glibc, but some other @@ -761,15 +567,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/locale/ru_RU/LC_MESSAGES # Remove the files we don't want to distribute rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libNoVersion* -%ifnarch %{ix86} alpha alphaev6 sparc sparcv9 rm -f $RPM_BUILD_ROOT/%{_lib}/libNoVersion* -%endif - -# the man pages for the linuxthreads require special attention -make -C linuxthreads/man -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 -install -m 0644 linuxthreads/man/*.3thr $RPM_BUILD_ROOT%{_mandir}/man3 -gzip -9nvf $RPM_BUILD_ROOT%{_mandir}/man3/* if [ -d $RPM_BUILD_ROOT%{_prefix}/info -a "%{_infodir}" != "%{_prefix}/info" ]; then mkdir -p $RPM_BUILD_ROOT%{_infodir} @@ -809,7 +607,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d chmod 644 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache # Install the upgrade program -install -m 700 build-%{_target_cpu}-linux/glibc_post_upgrade.%{_target_cpu} \ +install -m 700 build-%{nptl_target_cpu}-linuxnptl/glibc_post_upgrade.%{_target_cpu} \ $RPM_BUILD_ROOT/usr/sbin/glibc_post_upgrade.%{_target_cpu} strip -g $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.o @@ -835,14 +633,12 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/include/rpcsvc/rquota.[hx] # Hardlink identical locale files together %ifnarch %{auxarches} -gcc -O2 -o build-%{_target_cpu}-linux/hardlink fedora/hardlink.c -build-%{_target_cpu}-linux/hardlink -vc $RPM_BUILD_ROOT%{_prefix}/lib/locale +gcc -O2 -o build-%{nptl_target_cpu}-linuxnptl/hardlink fedora/hardlink.c +build-%{nptl_target_cpu}-linuxnptl/hardlink -vc $RPM_BUILD_ROOT%{_prefix}/lib/locale %endif -%ifarch %{ix86} alpha alphaev6 sparc sparcv9 rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss1-* rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss-*.so.1 -%endif # Ugly hack for buggy rpm ln -f ${RPM_BUILD_ROOT}%{_sbindir}/iconvconfig{,.%{_target_cpu}} @@ -950,21 +746,16 @@ rm -rf $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo cd fedora $GCC -Os -static -o build-locale-archive build-locale-archive.c \ - ../build-%{_target_cpu}-linux/locale/locarchive.o \ - ../build-%{_target_cpu}-linux/locale/md5.o \ + ../build-%{nptl_target_cpu}-linuxnptl/locale/locarchive.o \ + ../build-%{nptl_target_cpu}-linuxnptl/locale/md5.o \ -DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \ - -L../build-%{_target_cpu}-linux + -L../build-%{nptl_target_cpu}-linuxnptl install -m 700 build-locale-archive $RPM_BUILD_ROOT/usr/sbin/build-locale-archive cd .. # the last bit: more documentation rm -rf documentation mkdir documentation -cp linuxthreads/ChangeLog documentation/ChangeLog.threads -cp linuxthreads/Changes documentation/Changes.threads -cp linuxthreads/README documentation/README.threads -cp linuxthreads/FAQ.html documentation/FAQ-threads.html -cp -r linuxthreads/Examples documentation/examples.threads cp crypt/README.ufc-crypt documentation/README.ufc-crypt cp timezone/README documentation/README.timezone cp ChangeLog{,.14,.15} documentation @@ -986,63 +777,27 @@ ln -sf /%{_lib}/ld-linux-ia64.so.2 $RPM_BUILD_ROOT/lib/ld-linux-ia64.so.2 # Increase timeouts export TIMEOUTFACTOR=16 echo ====================TESTING========================= -cd build-%{_target_cpu}-linux -make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || : -cd .. -%ifarch i686 athlon -echo ====================TESTING LINUXTHREADS FS========= -cd build-%{_target_cpu}-linuxltfs -make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || : -cd .. -%endif -%ifarch %{nptlarches} -echo ====================TESTING NPTL==================== -cd build-%{nptl_target_cpu}-linuxnptl -make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || : +cd build-%{_target_cpu}-linuxnptl +make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || : cd .. %if %{buildxen} -echo ====================TESTING NPTL -mno-tls-direct-seg-refs============= +echo ====================TESTING -mno-tls-direct-seg-refs============= cd build-%{nptl_target_cpu}-linuxnptl-nosegneg make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check.log || : cd .. %endif -%endif echo ====================TESTING DETAILS================= for i in `sed -n 's|^.*\*\*\* \[\([^]]*\.out\)\].*$|\1|p' build-*-linux*/check.log`; do echo =====$i===== cat $i || : echo ============ done -%ifarch i686 athlon -echo ====================TESTING LINUXTHREADS FS LD.SO=== -cd build-%{_target_cpu}-linuxltfs -mv elf/ld.so elf/ld.so.orig -cp -a ../build-%{_target_cpu}-linux/elf/ld.so elf/ld.so -find . -name \*.out -exec mv -f '{}' '{}'.origldso \; -make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check2.log || : -cd .. -%endif -%ifarch %{nptlarches} -echo ====================TESTING NPTL LD.SO============== -cd build-%{nptl_target_cpu}-linuxnptl -mv elf/ld.so elf/ld.so.orig -cp -a ../build-%{_target_cpu}-linux/elf/ld.so elf/ld.so -find . -name \*.out -exec mv -f '{}' '{}'.origldso \; -make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1 | tee check2.log || : -cd .. -%endif -echo ====================TESTING DETAILS================= -for i in `sed -n 's|^.*\*\*\* \[\([^]]*\.out\)\].*$|\1|p' build-*-linux*/check2.log`; do - echo =====$i===== - cat $i || : - echo ============ -done echo ====================TESTING END===================== PLTCMD='/^Relocation section .*\(\.rela\?\.plt\|\.rela\.IA_64\.pltoff\)/,/^$/p' echo ====================PLT RELOCS LD.SO================ readelf -Wr $RPM_BUILD_ROOT/%{_lib}/ld-*.so | sed -n -e "$PLTCMD" echo ====================PLT RELOCS LIBC.SO============== -readelf -Wr $RPM_BUILD_ROOT/%{_lib}/$SubDir/libc-*.so | sed -n -e "$PLTCMD" +readelf -Wr $RPM_BUILD_ROOT/%{_lib}/libc-*.so | sed -n -e "$PLTCMD" echo ====================PLT RELOCS END================== %if "%{_enable_debug_packages}" == "1" @@ -1235,17 +990,6 @@ rm -f *.filelist* %files -f rpm.filelist %defattr(-,root,root) -%ifarch %{nptlarches} -%dir /%{_lib}/obsolete -%dir /%{_lib}/obsolete/linuxthreads -%ifarch i686 athlon -%dir /%{_lib}/obsolete/linuxthreads/i686 -%endif -%else -%ifarch i686 athlon -%dir /lib/i686 -%endif -%endif %if %{buildxen} && !%{xenpackage} %dir /%{_lib}/%{nosegneg_subdir} %endif @@ -1289,9 +1033,6 @@ rm -f *.filelist* %files -f headers.filelist headers %defattr(-,root,root) -%ifarch %{nptlarches} -%{_prefix}/include/linuxthreads -%endif %files -f profile.filelist profile %defattr(-,root,root) @@ -1315,14 +1056,6 @@ rm -f *.filelist* %attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/nscd/hosts %endif -%ifarch %{nptlarches} -%ifnarch %{auxarches} -%files -n linuxthreads-devel -%defattr(-,root,root) -%{_prefix}/%{_lib}/linuxthreads -%endif -%endif - %if "%{_enable_debug_packages}" == "1" %files debuginfo -f debuginfo.filelist %defattr(-,root,root) @@ -1344,6 +1077,13 @@ rm -f *.filelist* %endif %changelog +* Mon Jun 27 2005 Jakub Jelinek 2.3.90-1 +- update from CVS + - stack protector support + - fix xdr_{,u_}{longlong_t,hyper} on 64-bit arches (#161583) +- enable @GLIBC_2.4 symbols +- remove linuxthreads + * Mon Jun 20 2005 Jakub Jelinek 2.3.5-11 - update from CVS - PPC32 -msecure-plt support diff --git a/sources b/sources index 2be3a7a..9b72895 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d40647f89a4d48e549b9dd3011383ee4 glibc-20050620T1530.tar.bz2 -6b91ded8d7b88e907e907527c813566e glibc-fedora-20050620T1530.tar.bz2 +ecd156926c093ac5ab2881878e4e8fde glibc-20050627T0850.tar.bz2 +f83f45af959e2e3154a82e6e10d0e862 glibc-fedora-20050627T0850.tar.bz2