--- glibc-20041021T0701/ChangeLog	21 Oct 2004 01:29:31 -0000	1.8910

+++ glibc-20041021T0701-fedora/ChangeLog	21 Oct 2004 07:16:40 -0000	1.8782.2.27

@@ -1,3 +1,8 @@

+2004-10-20  Jakub Jelinek  <jakub@redhat.com>

+

+	* sysdeps/unix/sysv/linux/readonly-area.c (__readonly_area): If /proc

+	is not mounted, return 1.

+

 2004-10-20  Roland McGrath  <roland@redhat.com>

 	* Makeconfig ($(common-objpfx)shlib-versions.v.i): Check also

@@ -70,6 +75,11 @@

 	* debug/catchsegv.sh: Update copyright year.

 	Use mktemp to create segv_output file.

+2004-10-19  Jakub Jelinek  <jakub@redhat.com>

+

+	* include/features.h (__USE_FORTIFY_LEVEL): Enable even with

+	Red Hat gcc4 4.0.0 and above.

+

 2004-10-18  Jakub Jelinek  <jakub@redhat.com>

 	* elf/dl-libc.c (__libc_dlsym_private, __libc_register_dl_open_hook):

@@ -1053,6 +1063,22 @@

 	* string/string.h: Add __nonnull annotations.

 	* stdlib/stdlib.h: Likewise.

+2004-09-20  Jakub Jelinek  <jakub@redhat.com>

+

+	* sysdeps/unix/alpha/sysdep.h (inline_syscall[0-6]): Change name

+	argument to numbers from syscall names.

+	(INLINE_SYSCALL1): Pass __NR_##name to inline_syscall##nr.

+	(INTERNAL_SYSCALL_NCS): Renamed from...

+	(INTERNAL_SYSCALL_1): ... this.  Use INTERNAL_SYSCALL_NCS.

+	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h

+	(INTERNAL_SYSCALL_NCS): Define.

+	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h

+	(INTERNAL_SYSCALL_NCS): Likewise.

+	* sysdeps/unix/sysv/linux/sparc/sysdep.h (inline_syscall[0-6]):

+	Change name argument to numbers from syscall names.

+	(INLINE_SYSCALL, INTERNAL_SYSCALL): Adjust.

+	(INTERNAL_SYSCALL_NCS): Define.

+

 2004-09-20  H.J. Lu  <hongjiu.lu@intel.com>

 	* sysdeps/unix/sysv/linux/ia64/sysdep.h (DO_INLINE_SYSCALL):

@@ -1782,6 +1808,23 @@

 	before return type.

 	* locale/localename.c (__current_locale_name): Likewise.

+2004-08-31  Jakub Jelinek  <jakub@redhat.com>

+

+	* elf/ldconfig.c (parse_conf): Add prefix argument, prepend it

+	before arguments to add_dir and pass to parse_conf_include.

+	(parse_conf_include): Add prefix argument, pass it down to

+	parse_conf.

+	(main): Call arch_startup.  Adjust parse_conf caller.

+	Call add_arch_dirs.

+	* sysdeps/generic/dl-cache.h (arch_startup, add_arch_dirs): Define.

+	* sysdeps/unix/sysv/linux/i386/dl-cache.h: New file.

+	* sysdeps/unix/sysv/linux/ia64/dl-cache.h (EMUL_HACK, arch_startup,

+	add_arch_dirs): Define.

+	* sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed: Prepend

+	/emul/ia32-linux before the 32-bit ld.so pathname.

+	* sysdeps/unix/sysv/linux/ia64/dl-procinfo.c: New file.

+	* sysdeps/unix/sysv/linux/ia64/dl-procinfo.h: New file.

+

 2004-08-30  Roland McGrath  <roland@frob.com>

 	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit

@@ -1938,6 +1981,22 @@

 	* resolv/nss_dns/dns-canon.c (_nss_dns_getcanonname_r): Initialize

 	status to NSS_STATUS_UNAVAIL.

+2004-08-19  Jakub Jelinek  <jakub@redhat.com>

+

+	* sysdeps/powerpc/powerpc64/configure.in: New file.

+	* sysdeps/powerpc/powerpc64/configure: Rebuilt.

+	* config.h.in (USE_PPC64_OVERLAPPING_OPD): Add.

+	* configure.in (HAVE_ASM_GLOBAL_DOT_NAME): Remove.

+	* configure: Rebuilt.

+	* sysdeps/powerpc/powerpc64/sysdep.h: Formatting.

+	(OPD_ENT, BODY_LABEL, ENTRY_1, ENTRY_2, END_2, DOT_PREFIX,

+	BODY_PREFIX): Define.

+	(ENTRY, DOT_LABEL, END, TRACEBACK, END_GEN_TB, EALIGN): Support

+	HAVE_ASM_GLOBAL_DOT_NAME or no dot symbols,

+	USE_PPC64_OVERLAPPING_OPD or never overlapping .opd entries.

+	* sysdeps/powerpc/powerpc64/dl-machine.h: Include sysdep.h.

+	(TRAMPOLINE_TEMPLATE, RTLD_START): Use the new sysdep.h macros.

+

 2004-08-19  Ulrich Drepper  <drepper@redhat.com>

 	* sysdeps/posix/getaddrinfo.c (gaih_inet): Use h->h_name in the

@@ -2242,6 +2301,12 @@

 	* iconvdata/testdata/ISO-2022-JP-3: Regenerated.

+2004-07-23  Jakub Jelinek  <jakub@redhat.com>

+

+	[BZ #284]

+	* include/features.h (_POSIX_SOURCE, _POSIX_C_SOURCE): Define

+	if _XOPEN_SOURCE >= 500 even if __STRICT_ANSI__ is defined.

+

 2004-08-10  Alfred M. Szmidt  <ams@kemisten.nu>

 	* sysdeps/generic/bits/in.h (struct ip_mreq): Remove definition.

--- glibc-20041021T0701/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1

+++ glibc-20041021T0701-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.

+2000-10-02  Jakub Jelinek  <jakub@redhat.com>

+

+	* sunrpc/svc_udp.c (svcudp_recv): Set msg_controllen to all

+	remaining xp_pad space.

+

 2000-10-02  Ulrich Drepper  <drepper@redhat.com>

 	* include/features.h [__USE_FILE_OFFSET && !__REDIRECT]: Define

@@ -9280,6 +9285,12 @@

 	syscall.

 	* sysdeps/unix/sysv/linux/mips/truncate64.c: Likewise.

+2000-05-30  Jakub Jelinek  <jakub@redhat.com>

+

+	* resolv/res_query.c (res_nsearch): Remove unused variable

+	root_on_list. If dots >= statp->ndots and as is querydomain

+	fails, keep searching.

+

 2000-05-30  Ulrich Drepper  <drepper@redhat.com>

 	* sysdeps/unix/sysv/linux/alpha/oldglob.c (__old_glob): Loose __P.

@@ -9480,6 +9491,11 @@

 	* sysdeps/i386/fpu/bits/mathinline.h: Define expm1 inline only if

 	__FAST_MATH__ is defined.

+2000-05-22  Jakub Jelinek  <jakub@redhat.com>

+

+	* sysdeps/i386/fpu/bits/mathinline.h (__expm1_code): Avoid using ?:

+	with omitted middle operand.

+

 2000-05-22  Andreas Jaeger  <aj@suse.de>

 	* math/Makefile: Add -D__FAST_MATH__ to CFLAGS-test-ifloat.c,

@@ -9720,6 +9736,11 @@

 2000-05-17  Jakub Jelinek  <jakub@redhat.com>

+	* inet/rcmd.c (rcmd_af): If *ahost cannot be resolved, include

+	unresolved hostname in the message.

+

+2000-05-17  Jakub Jelinek  <jakub@redhat.com>

+

 	* 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-20041021T0701/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1

+++ glibc-20041021T0701-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.

+2001-01-10  Jakub Jelinek  <jakub@redhat.com>

+

+	* malloc/memusage.c (me): If not SUID/SGID, allow creating new

+	$MEMUSAGE_OUTPUT file.

+	* sysdeps/generic/segfault.c (segfault.c): If not SUID/SGID, allow

+	creating new $SEGFAULT_OUTPUT_NAME file.

+

 2001-01-10  H.J. Lu  <hjl@gnu.org>

 	* elf/dl-libc.c (do_dlopen): Call DL_STATIC_INIT for static binaries.

@@ -8130,6 +8137,11 @@

 	* sysdeps/powerpc/soft-fp/Versions: Likewise.

 	* sysdeps/sparc/sparc64/soft-fp/Versions: Likewise.

+2001-01-02  Jakub Jelinek  <jakub@redhat.com>

+

+	* locale/setlocale.c (setlocale): Don't allocate/free category name

+	unnecessarily.

+

 2001-01-02  Franz Sirl	<Franz.Sirl-kernel@lauterbach.com>

 	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.

--- glibc-20041021T0701/csu/elf-init.c	16 Aug 2004 04:51:00 -0000	1.3

+++ glibc-20041021T0701-fedora/csu/elf-init.c	22 Sep 2004 21:20:47 -0000	1.3.2.1

@@ -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;

 extern void (*__fini_array_end []) (void) attribute_hidden;

+

+# if defined HAVE_VISIBILITY_ATTRIBUTE \

+     && (defined SHARED || defined LIBC_NONSHARED)

+#  define hidden_undef_2(x) #x

+#  define hidden_undef_1(x) hidden_undef_2 (x)

+#  define hidden_undef(x) \

+  __asm (hidden_undef_1 (ASM_GLOBAL_DIRECTIVE) " " #x); \

+  __asm (".hidden " #x);

+# else

+#  define hidden_undef(x)

+# endif

+

+hidden_undef (__preinit_array_start)

+hidden_undef (__preinit_array_end)

+hidden_undef (__init_array_start)

+hidden_undef (__init_array_end)

+hidden_undef (__fini_array_start)

+hidden_undef (__fini_array_end)

 #endif

 /* These function symbols are provided for the .init/.fini section entry

--- glibc-20041021T0701/elf/dl-support.c	14 Oct 2004 02:06:18 -0000	1.86

+++ glibc-20041021T0701-fedora/elf/dl-support.c	14 Oct 2004 05:57:53 -0000	1.84.2.3

@@ -274,6 +274,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-20041021T0701/elf/ldconfig.c	10 Aug 2004 04:04:32 -0000	1.47

+++ glibc-20041021T0701-fedora/elf/ldconfig.c	22 Sep 2004 21:20:48 -0000	1.47.2.1

@@ -944,17 +944,19 @@ search_dirs (void)

 static void parse_conf_include (const char *config_file, unsigned int lineno,

-				bool do_chroot, const char *pattern);

+				const char *prefix, bool do_chroot,

+				const char *pattern);

 /* Parse configuration file.  */

 static void

-parse_conf (const char *filename, bool do_chroot)

+parse_conf (const char *filename, const char *prefix, bool do_chroot)

 {

   FILE *file = NULL;

   char *line = NULL;

   const char *canon;

   size_t len = 0;

   unsigned int lineno;

+  size_t prefix_len = prefix ? strlen (prefix) : 0;

   if (do_chroot && opt_chroot)

     {

@@ -1015,7 +1017,14 @@ parse_conf (const char *filename, bool d

 	  cp += 8;

 	  while ((dir = strsep (&cp, " \t")) != NULL)

 	    if (dir[0] != '\0')

-	      parse_conf_include (filename, lineno, do_chroot, dir);

+	      parse_conf_include (filename, lineno, prefix, do_chroot, dir);

+	}

+      else if (prefix != NULL)

+	{

+	  size_t cp_len = strlen (cp);

+	  char new_cp [prefix_len + cp_len + 1];

+	  memcpy (mempcpy (new_cp, prefix, prefix_len), cp, cp_len + 1);

+	  add_dir (new_cp);

 	}

       else

 	add_dir (cp);

@@ -1031,7 +1040,7 @@ parse_conf (const char *filename, bool d

    config files to read.  */

 static void

 parse_conf_include (const char *config_file, unsigned int lineno,

-		    bool do_chroot, const char *pattern)

+		    const char *prefix, bool do_chroot, const char *pattern)

 {

   if (opt_chroot && pattern[0] != '/')

     error (EXIT_FAILURE, 0,

@@ -1061,7 +1070,7 @@ parse_conf_include (const char *config_f

     {

     case 0:

       for (size_t i = 0; i < gl.gl_pathc; ++i)

-	parse_conf (gl.gl_pathv[i], false);

+	parse_conf (gl.gl_pathv[i], prefix, false);

       globfree64 (&gl);

       break;

@@ -1101,6 +1110,8 @@ main (int argc, char **argv)

 {

   int remaining;

+  arch_startup (argc, argv);

+

   /* Parse and process arguments.  */

   argp_parse (&argp, argc, argv, 0, &remaining, NULL);

@@ -1209,12 +1220,14 @@ main (int argc, char **argv)

   if (!opt_only_cline)

     {

-      parse_conf (config_file, true);

+      parse_conf (config_file, NULL, true);

       /* Always add the standard search paths.  */

       add_system_dir (SLIBDIR);

       if (strcmp (SLIBDIR, LIBDIR))

 	add_system_dir (LIBDIR);

+

+      add_arch_dirs (config_file);

     }

   search_dirs ();

--- glibc-20041021T0701/elf/rtld.c	14 Oct 2004 09:23:31 -0000	1.335

+++ glibc-20041021T0701-fedora/elf/rtld.c	14 Oct 2004 09:57:38 -0000	1.330.2.6

@@ -1087,6 +1087,53 @@ of this helper program; chances are you 

   ++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 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.  */

@@ -1259,6 +1306,67 @@ ERROR: ld.so: object '%s' from %s cannot

 	}

     }

+

+#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) {

+	  struct link_map *new_map;

+	  new_map = _dl_map_object (main_map, LIB_NOVERSION,

+				    1, lt_library, 0, 0, LM_ID_BASE);

+	  if (++new_map->l_opencount == 1) {

+	      /* It is no duplicate.  */

+	      ++npreloads;

+/* 	      _dl_sysdep_message(" DONE\n", NULL); */

+	  } else {

+/* 	      _dl_sysdep_message(" FAILED\n", NULL); */

+	  }

+      }

+	  

+      HP_TIMING_NOW (stop);

+      HP_TIMING_DIFF (diff, start, stop);

+      HP_TIMING_ACCUM_NT (load_time, diff);

+    }

+#endif

+

   if (__builtin_expect (npreloads, 0) != 0)

     {

       /* Set up PRELOADS with a vector of the preloaded libraries.  */

--- glibc-20041021T0701/elf/tst-tls10.h	17 Apr 2003 19:19:01 -0000	1.1

+++ glibc-20041021T0701-fedora/elf/tst-tls10.h	22 Sep 2004 21:20:48 -0000	1.1.2.1

@@ -1,8 +1,8 @@

 #include <tls.h>

 #include <stdlib.h>

-#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-20041021T0701/iconv/iconvconfig.c	24 Sep 2004 17:09:04 -0000	1.20

+++ glibc-20041021T0701-fedora/iconv/iconvconfig.c	22 Sep 2004 21:20:51 -0000	1.19.2.1

@@ -989,6 +989,34 @@ next_prime (uint32_t seed)

                               module name offset

                          (following last entry with step count 0)

 */

+

+static struct hash_entry *hash_table;

+static size_t hash_size;

+

+/* Function to insert the names.  */

+static void name_insert (const void *nodep, VISIT value, int level)

+{

+  struct name *name;

+  unsigned int idx;

+  unsigned int hval2;

+

+  if (value != leaf && value != postorder)

+    return;

+

+  name = *(struct name **) nodep;

+  idx = name->hashval % hash_size;

+  hval2 = 1 + name->hashval % (hash_size - 2);

+

+  while (hash_table[idx].string_offset != 0)

+    if ((idx += hval2) >= hash_size)

+      idx -= hash_size;

+

+  hash_table[idx].string_offset = strtaboffset (name->strent);

+

+  assert (name->module_idx != -1);

+  hash_table[idx].module_idx = name->module_idx;

+}

+

 static int

 write_output (void)

 {

@@ -996,8 +1024,6 @@ write_output (void)

   char *string_table;

   size_t string_table_size;

   struct gconvcache_header header;

-  struct hash_entry *hash_table;

-  size_t hash_size;

   struct module_entry *module_table;

   char *extra_table;

   char *cur_extra_table;

@@ -1010,31 +1036,6 @@ write_output (void)

 		+ strlen (".XXXXXX")];

   char finalname[prefix_len + sizeof (GCONV_MODULES_CACHE)];

-  /* Function to insert the names.  */

-  auto void

-  name_insert (const void *nodep, VISIT value, int level)

-    {

-      struct name *name;

-      unsigned int idx;

-      unsigned int hval2;

-

-      if (value != leaf && value != postorder)

-	return;

-

-      name = *(struct name **) nodep;

-      idx = name->hashval % hash_size;

-      hval2 = 1 + name->hashval % (hash_size - 2);

-

-      while (hash_table[idx].string_offset != 0)

-	if ((idx += hval2) >= hash_size)

-	  idx -= hash_size;

-

-      hash_table[idx].string_offset = strtaboffset (name->strent);

-

-      assert (name->module_idx != -1);

-      hash_table[idx].module_idx = name->module_idx;

-    }

-

   /* Open the output file.  */

   assert (GCONV_MODULES_CACHE[0] == '/');

   strcpy (stpcpy (mempcpy (tmpfname, prefix, prefix_len), GCONV_MODULES_CACHE),

--- glibc-20041021T0701/include/features.h	18 Oct 2004 04:17:16 -0000	1.36

+++ glibc-20041021T0701-fedora/include/features.h	18 Oct 2004 22:56:48 -0000	1.35.2.3

@@ -181,8 +181,8 @@

 /* If none of the ANSI/POSIX macros are defined, use POSIX.1 and POSIX.2

    (and IEEE Std 1003.1b-1993 unless _XOPEN_SOURCE is defined).  */

-#if (!defined __STRICT_ANSI__ && !defined _POSIX_SOURCE && \

-     !defined _POSIX_C_SOURCE)

+#if ((!defined __STRICT_ANSI__ || (_XOPEN_SOURCE - 0) >= 500) && \

+     !defined _POSIX_SOURCE && !defined _POSIX_C_SOURCE)

 # define _POSIX_SOURCE	1

 # if defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) < 500

 #  define _POSIX_C_SOURCE	2

@@ -262,7 +262,9 @@

 # define __USE_REENTRANT	1

 #endif

-#if _FORTIFY_SOURCE > 0 && __GNUC_PREREQ (4, 1) && __OPTIMIZE__ > 0

+#if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 \

+    && (__GNUC_PREREQ (4, 1) \

+        || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)))

 # if _FORTIFY_SOURCE == 1

 #  define __USE_FORTIFY_LEVEL 1

 # elif _FORTIFY_SOURCE > 1

--- glibc-20041021T0701/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23

+++ glibc-20041021T0701-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

 lithuanian      lt_LT.ISO-8859-13

-no_NO		nb_NO.ISO-8859-1

-no_NO.ISO-8859-1 nb_NO.ISO-8859-1

 norwegian       nb_NO.ISO-8859-1

 nynorsk		nn_NO.ISO-8859-1

 polish          pl_PL.ISO-8859-2

--- glibc-20041021T0701/libio/stdio.h	18 Oct 2004 04:17:15 -0000	1.79

+++ glibc-20041021T0701-fedora/libio/stdio.h	18 Oct 2004 09:58:44 -0000	1.78.2.2

@@ -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.  */

 extern struct _IO_FILE *stderr;		/* Standard error output stream.  */

+#ifdef __STDC__

 /* C89/C99 say they're macros.  Make them happy.  */

 #define stdin stdin

 #define stdout stdout

 #define stderr stderr

+#endif

 __BEGIN_NAMESPACE_STD

 /* Remove file FILENAME.  */

--- glibc-20041021T0701/linuxthreads/ChangeLog	19 Oct 2004 05:13:11 -0000	1.825

+++ glibc-20041021T0701-fedora/linuxthreads/ChangeLog	20 Oct 2004 10:47:15 -0000	1.817.2.7

@@ -671,6 +671,12 @@

 	(pthread_barrierattr_setpshared): Return EINVAL if pshared

 	is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED.

+2003-09-02  Jakub Jelinek  <jakub@redhat.com>

+

+	* sysdeps/sparc/tls.h (TLS_TCB_SIZE): If in ld.so and NPTL struct

+	pthread is bigger than struct _pthread_descr_struct, use NPTL struct

+	pthread size.

+

 2003-09-02  Ulrich Drepper  <drepper@redhat.com>

 	* sysdeps/unix/sysv/linux/i386/dl-sysdep.h

@@ -803,6 +809,34 @@

 2003-07-22  Jakub Jelinek  <jakub@redhat.com>

+	* sysdeps/alpha/tls.h (TLS_INIT_TCB_SIZE, TLS_TCB_SIZE): Change to 0.

+	(TLS_INIT_TCB_ALIGN, TLS_TCB_ALIGN): Alignment of struct

+	_pthread_descr_struct.

+	(TLS_PRE_TCB_SIZE): Add sizeof (tcbhead_t) and pad to align.

+	If in ld.so and NPTL struct pthread is bigger than struct

+	_pthread_descr_struct, use NPTL struct pthread size.

+	(TLS_TCB_OFFSET): Define.

+	(INSTALL_DTV, INSTALL_NEW_DTV, GET_DTV, TLS_INIT_TP, THREAD_DTV,

+	THREAD_SELF, INIT_THREAD_SELF): Changed to match NPTL tls.h

+	definitions.

+	* sysdeps/i386/tls.h (TLS_TCB_SIZE): If in ld.so and NPTL struct

+	pthread is bigger than struct _pthread_descr_struct, use NPTL struct

+	pthread size.

+	* sysdeps/ia64/tls.h (TLS_PRE_TCB_SIZE): Likewise.

+	* sysdeps/powerpc/tls.h (TLS_PRE_TCB_SIZE): Likewise.

+	* sysdeps/s390/tls.h (TLS_TCB_SIZE): Likewise.

+	* sysdeps/sh/tls.h (TLS_PRE_TCB_SIZE): Likewise.

+	* sysdeps/x86_64/tls.h (TLS_TCB_SIZE): Likewise.

+	* sysdeps/pthread/Makefile (gen-as-const-headers): Add

+	nptl-struct-pthread.sym if nptl tree is present.

+	(before-compile): Add $(common-objpfx)nptl-struct-pthread.h

+	if nptl tree is not present.

+	(common-generated): Add nptl-struct-pthread.h.

+	($(common-objpfx)nptl-struct-pthread.h): New rule.

+	* sysdeps/pthread/nptl-struct-pthread.sym: New file.

+

+2003-07-22  Jakub Jelinek  <jakub@redhat.com>

+

 	* 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-20041021T0701/linuxthreads/Makefile	19 Oct 2004 05:12:58 -0000	1.95

+++ glibc-20041021T0701-fedora/linuxthreads/Makefile	20 Oct 2004 10:47:17 -0000	1.94.2.2

@@ -256,15 +256,18 @@ $(addprefix $(objpfx), \

   $(filter-out $(tests-static) $(tests-reverse) unload, \

     $(tests) $(test-srcs))): $(objpfx)libpthread.so \

 			     $(objpfx)libpthread_nonshared.a

-# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so,

+# $(objpfx)linklibc.so is used instead of $(common-objpfx)libc.so,

 # since otherwise libpthread.so comes before libc.so when linking.

 $(addprefix $(objpfx), $(tests-reverse)): \

-  $(objpfx)../libc.so $(objpfx)libpthread.so \

+  $(objpfx)linklibc.so $(objpfx)libpthread.so \

   $(objpfx)libpthread_nonshared.a

 $(objpfx)../libc.so: $(common-objpfx)libc.so ;

 $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.so

 $(objpfx)unload: $(common-objpfx)dlfcn/libdl.so

 $(objpfx)unload.out: $(objpfx)libpthread.so $(objpfx)libpthread_nonshared.a

+$(objpfx)linklibc.so: $(common-objpfx)libc.so

+	ln -s ../libc.so $@

+generated += libclink.so

 else

 $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a

 $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a

--- glibc-20041021T0701/linuxthreads/cancel.c	22 Feb 2003 00:55:21 -0000	1.23

+++ glibc-20041021T0701-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

     }

   /* And the TSD which needs special help.  */

+  THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE);

   __libc_thread_freeres ();

 }

--- glibc-20041021T0701/linuxthreads/lockfile.c	18 Dec 2002 01:16:46 -0000	1.10

+++ glibc-20041021T0701-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);

   for (i = _IO_iter_begin(); i != _IO_iter_end(); i = _IO_iter_next(i))

-    __pthread_mutex_init (_IO_iter_file(i)->_lock, &attr);

+    {

+      _IO_lock_t *_lock = _IO_iter_file(i)->_lock;

+      if (_lock)

+	__pthread_mutex_init (_lock, &attr);

+    }

   __pthread_mutexattr_destroy (&attr);

--- glibc-20041021T0701/linuxthreads/semaphore.h	17 Apr 2004 23:01:39 -0000	1.13

+++ glibc-20041021T0701-fedora/linuxthreads/semaphore.h	22 Sep 2004 21:20:55 -0000	1.13.2.1

@@ -21,6 +21,7 @@

 # define __need_timespec

 # include <time.h>

 #endif

+#include <bits/pthreadtypes.h>

 #ifndef _PTHREAD_DESCR_DEFINED

 /* Thread descriptors.  Needed for `sem_t' definition.  */

--- glibc-20041021T0701/linuxthreads/tst-tls1.h	2 Sep 2003 00:29:30 -0000	1.1

+++ glibc-20041021T0701-fedora/linuxthreads/tst-tls1.h	22 Sep 2004 21:20:55 -0000	1.1.2.1

@@ -2,7 +2,7 @@

 #include <stdlib.h>

 #include <tls.h>

-#if USE_TLS && HAVE___THREAD

+#if USE_TLS && (0 || HAVE___THREAD)

 struct tls_obj

 {

--- glibc-20041021T0701/linuxthreads/sysdeps/alpha/tls.h	30 Jan 2003 21:03:40 -0000	1.5

+++ glibc-20041021T0701-fedora/linuxthreads/sysdeps/alpha/tls.h	22 Sep 2004 21:20:55 -0000	1.5.2.1

@@ -53,54 +53,76 @@ typedef struct

 #  include <sysdep.h>

 /* This is the size of the initial TCB.  */

-#  define TLS_INIT_TCB_SIZE	sizeof (tcbhead_t)

+#  define TLS_INIT_TCB_SIZE	0

 /* Alignment requirements for the initial TCB.  */

-#  define TLS_INIT_TCB_ALIGN	__alignof__ (tcbhead_t)

+#  define TLS_INIT_TCB_ALIGN	__alignof__ (struct _pthread_descr_struct)

 /* This is the size of the TCB.  */

-#  define TLS_TCB_SIZE		sizeof (tcbhead_t)

+#  define TLS_TCB_SIZE		0

 /* Alignment requirements for the TCB.  */

-#  define TLS_TCB_ALIGN		__alignof__ (tcbhead_t)

+#  define TLS_TCB_ALIGN		__alignof__ (struct _pthread_descr_struct)

 /* This is the size we need before TCB.  */

-#  define TLS_PRE_TCB_SIZE	sizeof (struct _pthread_descr_struct)

+#  ifndef IS_IN_rtld