[Commits] r21354 - in /branches/eglibc-2_16: ./ libc/ libc/sysdeps/powerpc/powerpc32/ ports/sysdeps/arm/bits/

[joseph@xxxxxxxxxx]

Author: joseph
Date: Thu Oct 25 19:09:23 2012
New Revision: 21354

Log:
Merge changes between r21109 and r21353 from /fsf/glibc-2_16-branch.

Added:
    branches/eglibc-2_16/libc/sysdeps/powerpc/powerpc32/compat-ppc-mcount.S
      - copied unchanged from r21353, fsf/glibc-2_16-branch/libc/sysdeps/powerpc/powerpc32/compat-ppc-mcount.S
Modified:
    branches/eglibc-2_16/   (props changed)
    branches/eglibc-2_16/libc/ChangeLog
    branches/eglibc-2_16/libc/NEWS
    branches/eglibc-2_16/libc/sysdeps/powerpc/powerpc32/Makefile
    branches/eglibc-2_16/libc/sysdeps/powerpc/powerpc32/ppc-mcount.S
    branches/eglibc-2_16/ports/sysdeps/arm/bits/predefs.h   (props changed)

Propchange: branches/eglibc-2_16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 25 19:09:23 2012
@@ -1,2 +1,2 @@
-/fsf/glibc-2_16-branch:19382-21109
+/fsf/glibc-2_16-branch:19382-21353
 /fsf/trunk:15224-19381

Modified: branches/eglibc-2_16/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_16/libc/ChangeLog (original)
+++ branches/eglibc-2_16/libc/ChangeLog Thu Oct 25 19:09:23 2012
@@ -15,6 +15,15 @@
 	[BZ #6530]
 	* stdio-common/vfprintf.c (process_string_arg): Revert
 	2000-07-22 change.
+
+2012-07-06  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	[BZ #14042]
+	* sysdeps/powerpc/powerpc32/ppc-mcount.S [SHARED]: Don't use PLT
+	for call to __mcount_internal.
+	* sysdeps/powerpc/powerpc32/Makefile (sysdep_routines)
+	(shared-only-routines) [$(subdir) = gmon]: Add compat-ppc-mcount.
+	* sysdeps/powerpc/powerpc32/compat-ppc-mcount.S: New file.
 
 2011-09-28  Jonathan Nieder  <jrnieder@xxxxxxxxx>
 

Modified: branches/eglibc-2_16/libc/NEWS
==============================================================================
--- branches/eglibc-2_16/libc/NEWS (original)
+++ branches/eglibc-2_16/libc/NEWS Thu Oct 25 19:09:23 2012
@@ -9,7 +9,7 @@
 
 * The following bugs are resolved with this release:
 
-  6530, 14195, 14459, 14476, 14562, 14621, 14648
+  6530, 14195, 14459, 14476, 14562, 14621, 14648, 14756
 
 Version 2.16
 

Modified: branches/eglibc-2_16/libc/sysdeps/powerpc/powerpc32/Makefile
==============================================================================
--- branches/eglibc-2_16/libc/sysdeps/powerpc/powerpc32/Makefile (original)
+++ branches/eglibc-2_16/libc/sysdeps/powerpc/powerpc32/Makefile Thu Oct 25 19:09:23 2012
@@ -6,8 +6,9 @@
 endif
 
 ifeq ($(subdir),gmon)
-sysdep_routines += ppc-mcount
+sysdep_routines += ppc-mcount compat-ppc-mcount
 static-only-routines += ppc-mcount
+shared-only-routines += compat-ppc-mcount
 endif
 
 ifeq ($(subdir),misc)

Modified: branches/eglibc-2_16/libc/sysdeps/powerpc/powerpc32/ppc-mcount.S
==============================================================================
--- branches/eglibc-2_16/libc/sysdeps/powerpc/powerpc32/ppc-mcount.S (original)
+++ branches/eglibc-2_16/libc/sysdeps/powerpc/powerpc32/ppc-mcount.S Thu Oct 25 19:09:23 2012
@@ -1,5 +1,5 @@
 /* PowerPC-specific implementation of profiling support.
-   Copyright (C) 1997, 1999, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 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
@@ -57,7 +57,11 @@
 	stw	r4, 44(r1)
 	cfi_offset (lr, -4)
 	stw	r5,  8(r1)
+#ifndef SHARED
 	bl	JUMPTARGET(__mcount_internal)
+#else
+	bl	__mcount_internal@local
+#endif
  /* Restore the registers...  */
 	lwz     r6,  8(r1)
 	lwz	r0, 44(r1)

Propchange: branches/eglibc-2_16/ports/sysdeps/arm/bits/predefs.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 25 19:09:23 2012
@@ -1,3 +1,3 @@
-/fsf/glibc-2_16-branch/ports/sysdeps/arm/bits/predefs.h:19382-21109
+/fsf/glibc-2_16-branch/ports/sysdeps/arm/bits/predefs.h:19382-21353
 /fsf/trunk/ports/sysdeps/arm/bits/predefs.h:18166-19381
 /fsf/trunk/ports/sysdeps/arm/eabi/bits/predefs.h:15224-17813

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits