GNU C Library master sources branch, rth/axp, created. glibc-2.11-295-gd09580b

[rth at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, rth/axp has been created
        at  d09580b1e6c3158fd00a41e71ec5a4ace9f0a2fe (commit)

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d09580b1e6c3158fd00a41e71ec5a4ace9f0a2fe

commit d09580b1e6c3158fd00a41e71ec5a4ace9f0a2fe
Author: Richard Henderson <rth@twiddle.net>
Date:   Fri Mar 26 09:51:57 2010 -0700

    Mark _dl_random attribute_relro in the header file.
    
    It's already so marked in dl-sysdep.c.  Failure to so mark
    in the header file leads the compiler to believe that the
    variable should be addressable via the .sdata section.
    
    Signed-off-by: Richard Henderson <rth@twiddle.net>

diff --git a/ChangeLog b/ChangeLog
index 367eafd..cce81c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-03-26  Richard Henderson  <rth@redhat.com>
 
+	* sysdeps/generic/ldsodefs.h (_dl_random): Mark attribute_relro;
+
+2010-03-26  Richard Henderson  <rth@redhat.com>
+
 	* stdio-common/psiginfo.c (psiginfo): Fix printf format
 	warning for si_band.
 
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 230c39a..a14e8af 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -748,7 +748,7 @@ extern int _dl_starting_up_internal attribute_hidden;
 #endif
 
 /* Random data provided by the kernel.  */
-extern void *_dl_random attribute_hidden;
+extern void *_dl_random attribute_hidden attribute_relro;
 
 /* OS-dependent function to open the zero-fill device.  */
 extern int _dl_sysdep_open_zero_fill (void); /* dl-sysdep.c */

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=68cf34be99d6d6241bd25a091d0e511121497ef9

commit 68cf34be99d6d6241bd25a091d0e511121497ef9
Author: Richard Henderson <rth@twiddle.net>
Date:   Fri Mar 26 09:48:44 2010 -0700

    Fix printf format warning for si_band.
    
    Signed-off-by: Richard Henderson <rth@twiddle.net>

diff --git a/ChangeLog b/ChangeLog
index 23393e6..367eafd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-03-26  Richard Henderson  <rth@redhat.com>
 
+	* stdio-common/psiginfo.c (psiginfo): Fix printf format
+	warning for si_band.
+
+2010-03-26  Richard Henderson  <rth@redhat.com>
+
 	* locale/setlocale.c (free_category): Finish renaming
 	struct locale_data to __locale_data.
 
diff --git a/stdio-common/psiginfo.c b/stdio-common/psiginfo.c
index e089fca..90cdf05 100644
--- a/stdio-common/psiginfo.c
+++ b/stdio-common/psiginfo.c
@@ -170,7 +170,7 @@ Signal generated by the completion of an I/O request");
 	fprintf (fp, "%ld %d %ld)", (long int) pinfo->si_pid, pinfo->si_status,
 		 (long int) pinfo->si_uid);
       else if (pinfo->si_signo == SIGPOLL)
-	fprintf (fp, "%ld)", pinfo->si_band);
+	fprintf (fp, "%ld)", (long int) pinfo->si_band);
       else
 	fprintf (fp, "%ld %ld)",
 		 (long int) pinfo->si_pid, (long int) pinfo->si_uid);

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6e9331df8bb546363724aaf50d8b023a0167c06d

commit 6e9331df8bb546363724aaf50d8b023a0167c06d
Author: Richard Henderson <rth@twiddle.net>
Date:   Fri Mar 26 09:21:34 2010 -0700

    Finish locale_data -> __locale_data transition.
    
    The transition that was begun here
    f095bb7204d80f609a73a22796edd6cffd4c6add
    was not complete.
    
    Signed-off-by: Richard Henderson <rth@twiddle.net>

diff --git a/ChangeLog b/ChangeLog
index 72cbef6..23393e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-03-26  Richard Henderson  <rth@redhat.com>
 
+	* locale/setlocale.c (free_category): Finish renaming
+	struct locale_data to __locale_data.
+
+2010-03-26  Richard Henderson  <rth@redhat.com>
+
 	* csu/gmon-start.c (ENTRY_POINT, etext): Declare as char[], not void.
 	* elf/dl-sysdep.c (_end): Likewise.
 	* sysdeps/unix/sysv/dl-sysdep.c (frob_brk): Likewise with locally
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 4ebce78..46372fd 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -465,7 +465,7 @@ libc_hidden_def (setlocale)
 
 static void __libc_freeres_fn_section
 free_category (int category,
-	       struct __locale_data *here, struct locale_data *c_data)
+	       struct __locale_data *here, struct __locale_data *c_data)
 {
   struct loaded_l10nfile *runp = _nl_locale_file_list[category];
 
@@ -481,7 +481,7 @@ free_category (int category,
   while (runp != NULL)
     {
       struct loaded_l10nfile *curr = runp;
-      struct __locale_data *data = (struct locale_data *) runp->data;
+      struct __locale_data *data = (struct __locale_data *) runp->data;
 
       if (data != NULL && data != c_data)
 	_nl_unload_locale (data);

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b1c1949e60e7c61bcd9f40f712d07494596491b2

commit b1c1949e60e7c61bcd9f40f712d07494596491b2
Author: Richard Henderson <rth@twiddle.net>
Date:   Fri Mar 26 09:16:21 2010 -0700

    Don't take the address of a void object.
    
    GCC 4.5 warns about "extern void _end; &end;".
    Use char[] instead, as that also doesn't fall foul
    of a target's .sdata optimizations.
    
    Signed-off-by: Richard Henderson <rth@twiddle.net>

diff --git a/ChangeLog b/ChangeLog
index 8117882..72cbef6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-26  Richard Henderson  <rth@redhat.com>
+
+	* csu/gmon-start.c (ENTRY_POINT, etext): Declare as char[], not void.
+	* elf/dl-sysdep.c (_end): Likewise.
+	* sysdeps/unix/sysv/dl-sysdep.c (frob_brk): Likewise with locally
+	declared _end, and associated variables.
+
 2010-03-26  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/posix/getaddrinfo.c (gaih_inet): Don't assume success always
diff --git a/csu/gmon-start.c b/csu/gmon-start.c
index d11c9b9..7d585e1 100644
--- a/csu/gmon-start.c
+++ b/csu/gmon-start.c
@@ -31,9 +31,9 @@
 #ifdef ENTRY_POINT_DECL
 ENTRY_POINT_DECL(extern)
 #else
-extern void ENTRY_POINT;
+extern char ENTRY_POINT[];
 #endif
-extern void etext;
+extern char etext[];
 
 #ifndef TEXT_START
 # ifdef ENTRY_POINT_DECL
diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c
index 5507e57..160503d 100644
--- a/elf/dl-sysdep.c
+++ b/elf/dl-sysdep.c
@@ -47,7 +47,7 @@
 #endif
 
 extern char **_environ attribute_hidden;
-extern void _end attribute_hidden;
+extern char _end[] attribute_hidden;
 
 /* Protect SUID program against misuse of file descriptors.  */
 extern void __libc_check_standard_fds (void);
@@ -226,14 +226,14 @@ _dl_sysdep_start (void **start_argptr,
   if (GLRO(dl_platform) != NULL)
     GLRO(dl_platformlen) = strlen (GLRO(dl_platform));
 
-  if (__sbrk (0) == &_end)
+  if (__sbrk (0) == _end)
     /* The dynamic linker was run as a program, and so the initial break
        starts just after our bss, at &_end.  The malloc in dl-minimal.c
        will consume the rest of this page, so tell the kernel to move the
        break up that far.  When the user program examines its break, it
        will see this new value and not clobber our data.  */
     __sbrk (GLRO(dl_pagesize)
-	    - ((&_end - (void *) 0) & (GLRO(dl_pagesize) - 1)));
+	    - ((_end - (char *) 0) & (GLRO(dl_pagesize) - 1)));
 
   /* If this is a SUID program we make sure that FDs 0, 1, and 2 are
      allocated.  If necessary we are doing it ourself.  If it is not
diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c
index 08ae9aa..34e8808 100644
--- a/sysdeps/unix/sysv/linux/dl-sysdep.c
+++ b/sysdeps/unix/sysv/linux/dl-sysdep.c
@@ -47,12 +47,12 @@ frob_brk (void)
      Later Linux kernels have changed this behavior so that the initial
      break value is rounded up to the page boundary before we start.  */
 
-  extern void *__curbrk attribute_hidden;
-  extern void _end attribute_hidden;
-  void *const endpage = (void *) 0 + (((__curbrk - (void *) 0)
+  extern char *__curbrk attribute_hidden;
+  extern char _end[] attribute_hidden;
+  char *const endpage = (void *) 0 + (((__curbrk - (char *) 0)
 				       + GLRO(dl_pagesize) - 1)
 				      & -GLRO(dl_pagesize));
-  if (__builtin_expect (__curbrk >= &_end && __curbrk < endpage, 0))
+  if (__builtin_expect (__curbrk >= _end && __curbrk < endpage, 0))
     __brk (endpage);
 #endif
 }

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU C Library master sources