[commits] r12439 - in /fsf/trunk/ports: ChangeLog.mips sysdeps/mach/hurd/mips/init-first.c sysdeps/mips/init-first.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Dec 31 00:03:43 2010
New Revision: 12439

Log:
Import glibc-ports-mainline for 2010-12-31

Modified:
    fsf/trunk/ports/ChangeLog.mips
    fsf/trunk/ports/sysdeps/mach/hurd/mips/init-first.c
    fsf/trunk/ports/sysdeps/mips/init-first.c

Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Fri Dec 31 00:03:43 2010
@@ -1,3 +1,9 @@
+2010-12-30  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/mips/init-first.c: Don't call __libc_global_ctors if
+	NO_CTORS_DTORS_SECTIONS is defined.
+	* sysdeps/mach/hurd/mips/init-first.c: Likewise.
+
 2010-12-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/mips/stackinfo.h: Define DEFAULT_STACK_PERMS with PF_X.

Modified: fsf/trunk/ports/sysdeps/mach/hurd/mips/init-first.c
==============================================================================
--- fsf/trunk/ports/sysdeps/mach/hurd/mips/init-first.c (original)
+++ fsf/trunk/ports/sysdeps/mach/hurd/mips/init-first.c Fri Dec 31 00:03:43 2010
@@ -1,5 +1,5 @@
 /* Initialization code run first thing by the ELF startup code.  For Mips/Hurd.
-   Copyright (C) 1996,1997,1998,2000,01,02,03 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,1998,2000,01,02,03,10 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -119,7 +119,7 @@
   __getopt_clean_environment (envp);
 #endif
 
-#ifdef SHARED
+#if defined SHARED && !defined NO_CTORS_DTORS_SECTIONS
   __libc_global_ctors ();
 #endif
 

Modified: fsf/trunk/ports/sysdeps/mips/init-first.c
==============================================================================
--- fsf/trunk/ports/sysdeps/mips/init-first.c (original)
+++ fsf/trunk/ports/sysdeps/mips/init-first.c Fri Dec 31 00:03:43 2010
@@ -1,5 +1,5 @@
 /* Initialization code run first thing by the ELF startup code.  For mips/Unix.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -50,7 +50,9 @@
 {
   init (&argc);
 
+#ifndef NO_CTORS_DTORS_SECTIONS
   __libc_global_ctors ();
+#endif
 }
 #endif