[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[commits] r13229 - in /branches/eglibc-2_13/ports: ./ sysdeps/arm/ sysdeps/arm/eabi/ sysdeps/arm/eabi/bits/ sysdeps/unix/sysv/linux/ar...



Author: joseph
Date: Mon Mar 21 10:52:27 2011
New Revision: 13229

Log:
Merge changes between r13054 and r13228 from /fsf/glibc-2_13-branch.

ports:
	* sysdeps/arm/eabi/bits/predefs.h: Correct license reference in
	last paragraph of license notice.

Modified:
    branches/eglibc-2_13/ports/ChangeLog.arm
    branches/eglibc-2_13/ports/ChangeLog.eglibc
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/__longjmp.S
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/bits/fenv.h
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/bits/predefs.h
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/fclrexcpt.c
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/fedisblxcpt.c
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/feenablxcpt.c
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/fegetenv.c
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/fegetexcept.c
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/fegetround.c
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/feholdexcpt.c
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/fesetenv.c
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/fesetround.c
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/fpu_control.h
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/fraiseexcpt.c
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/fsetexcptflg.c
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/ftestexcept.c
    branches/eglibc-2_13/ports/sysdeps/arm/eabi/setjmp.S
    branches/eglibc-2_13/ports/sysdeps/arm/sysdep.h
    branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/arm/____longjmp_chk.S
    branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S

Modified: branches/eglibc-2_13/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_13/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_13/ports/ChangeLog.arm Mon Mar 21 10:52:27 2011
@@ -1,3 +1,24 @@
+2011-03-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/arm/eabi/__longjmp.S, sysdeps/arm/eabi/bits/fenv.h,
+	sysdeps/arm/eabi/fclrexcpt.c, sysdeps/arm/eabi/fedisblxcpt.c,
+	sysdeps/arm/eabi/feenablxcpt.c, sysdeps/arm/eabi/fegetenv.c,
+	sysdeps/arm/eabi/fegetexcept.c, sysdeps/arm/eabi/fegetround.c,
+	sysdeps/arm/eabi/feholdexcpt.c, sysdeps/arm/eabi/fesetenv.c,
+	sysdeps/arm/eabi/fesetround.c, sysdeps/arm/eabi/fpu_control.h,
+	sysdeps/arm/eabi/fraiseexcpt.c, sysdeps/arm/eabi/fsetexcptflg.c,
+	sysdeps/arm/eabi/ftestexcept.c, sysdeps/arm/eabi/setjmp.S,
+	sysdeps/unix/sysv/linux/arm/____longjmp_chk.S,
+	sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S: Correct
+	license reference in last paragraph of license notice.
+
+2011-02-16  Manjunath Matti  <manjunath81@xxxxxxxxx>
+
+	* sysdeps/arm/sysdep.h (CALL_MCOUNT): Use __gnu_mcount_nc
+	interface for EABI with GCC 4.4 or later.
+	(mcount): Define to __gnu_mcount_nc for EABI with GCC 4.4 or
+	later.
+
 2011-01-25  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/arm/bits/mman.h (MADV_HUGEPAGE,

Modified: branches/eglibc-2_13/ports/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_13/ports/ChangeLog.eglibc (original)
+++ branches/eglibc-2_13/ports/ChangeLog.eglibc Mon Mar 21 10:52:27 2011
@@ -1,3 +1,8 @@
+2011-03-21  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/arm/eabi/bits/predefs.h: Correct license reference in
+	last paragraph of license notice.
+
 2010-10-12  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/powerpc/powerpc32/e500/fpu/feupdateenv.c (feupdateenv):

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/__longjmp.S
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/__longjmp.S (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/__longjmp.S Mon Mar 21 10:52:27 2011
@@ -13,10 +13,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <sysdep.h>
 #define _SETJMP_H

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/bits/fenv.h
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/bits/fenv.h (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/bits/fenv.h Mon Mar 21 10:52:27 2011
@@ -11,10 +11,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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.  */
 
 #ifndef _FENV_H
 # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/bits/predefs.h
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/bits/predefs.h (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/bits/predefs.h Mon Mar 21 10:52:27 2011
@@ -11,10 +11,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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.  */
 
 #ifndef _FEATURES_H
 # error "Never use <bits/predefs.h> directly; include <features.h> instead."

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/fclrexcpt.c
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/fclrexcpt.c (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/fclrexcpt.c Mon Mar 21 10:52:27 2011
@@ -12,10 +12,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <fenv.h>
 #include <fpu_control.h>

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/fedisblxcpt.c
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/fedisblxcpt.c (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/fedisblxcpt.c Mon Mar 21 10:52:27 2011
@@ -13,10 +13,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <fenv.h>
 #include <fpu_control.h>

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/feenablxcpt.c
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/feenablxcpt.c (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/feenablxcpt.c Mon Mar 21 10:52:27 2011
@@ -13,10 +13,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <fenv.h>
 #include <fpu_control.h>

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/fegetenv.c
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/fegetenv.c (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/fegetenv.c Mon Mar 21 10:52:27 2011
@@ -12,10 +12,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <fenv.h>
 #include <fpu_control.h>

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/fegetexcept.c
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/fegetexcept.c (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/fegetexcept.c Mon Mar 21 10:52:27 2011
@@ -13,10 +13,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <fenv.h>
 #include <fpu_control.h>

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/fegetround.c
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/fegetround.c (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/fegetround.c Mon Mar 21 10:52:27 2011
@@ -12,10 +12,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <fenv.h>
 #include <fpu_control.h>

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/feholdexcpt.c
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/feholdexcpt.c (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/feholdexcpt.c Mon Mar 21 10:52:27 2011
@@ -12,10 +12,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <fenv.h>
 #include <fpu_control.h>

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/fesetenv.c
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/fesetenv.c (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/fesetenv.c Mon Mar 21 10:52:27 2011
@@ -12,10 +12,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <fenv.h>
 #include <fpu_control.h>

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/fesetround.c
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/fesetround.c (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/fesetround.c Mon Mar 21 10:52:27 2011
@@ -12,10 +12,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <fenv.h>
 #include <fpu_control.h>

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/fpu_control.h
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/fpu_control.h (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/fpu_control.h Mon Mar 21 10:52:27 2011
@@ -12,10 +12,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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.  */
 
 #ifndef _FPU_CONTROL_H
 #define _FPU_CONTROL_H

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/fraiseexcpt.c
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/fraiseexcpt.c (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/fraiseexcpt.c Mon Mar 21 10:52:27 2011
@@ -12,10 +12,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <fpu_control.h>
 #include <fenv.h>

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/fsetexcptflg.c
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/fsetexcptflg.c (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/fsetexcptflg.c Mon Mar 21 10:52:27 2011
@@ -12,10 +12,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <fenv.h>
 #include <math.h>

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/ftestexcept.c
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/ftestexcept.c (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/ftestexcept.c Mon Mar 21 10:52:27 2011
@@ -12,10 +12,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <fenv.h>
 #include <fpu_control.h>

Modified: branches/eglibc-2_13/ports/sysdeps/arm/eabi/setjmp.S
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/eabi/setjmp.S (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/eabi/setjmp.S Mon Mar 21 10:52:27 2011
@@ -12,10 +12,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <sysdep.h>
 #define _SETJMP_H

Modified: branches/eglibc-2_13/ports/sysdeps/arm/sysdep.h
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/arm/sysdep.h (original)
+++ branches/eglibc-2_13/ports/sysdeps/arm/sysdep.h Mon Mar 21 10:52:27 2011
@@ -18,6 +18,7 @@
    02111-1307 USA.  */
 
 #include <sysdeps/generic/sysdep.h>
+#include <features.h>
 
 #if (!defined (__ARM_ARCH_2__) && !defined (__ARM_ARCH_3__) \
      && !defined (__ARM_ARCH_3M__) && !defined (__ARM_ARCH_4__))
@@ -92,6 +93,16 @@
 
 /* If compiled for profiling, call `mcount' at the start of each function.  */
 #ifdef	PROF
+/* Call __gnu_mcount_nc if GCC >= 4.4 and abi = EABI.  */
+#if __GNUC_PREREQ(4,4) && defined(__ARM_EABI__)
+#define CALL_MCOUNT \
+  str	lr,[sp, #-4]!; \
+  cfi_adjust_cfa_offset (4); \
+  cfi_rel_offset (lr, 0); \
+  bl PLTJMP(mcount); \
+  cfi_adjust_cfa_offset (-4); \
+  cfi_restore (lr)
+#else /* else call _mcount */
 #define CALL_MCOUNT \
   str	lr,[sp, #-4]!; \
   cfi_adjust_cfa_offset (4); \
@@ -100,6 +111,7 @@
   ldr lr, [sp], #4; \
   cfi_adjust_cfa_offset (-4); \
   cfi_restore (lr)
+#endif
 #else
 #define CALL_MCOUNT		/* Do nothing.  */
 #endif
@@ -109,7 +121,11 @@
    on this system, the asm identifier `syscall_error' intrudes on the
    C name space.  Make sure we use an innocuous name.  */
 #define	syscall_error	__syscall_error
+#if __GNUC_PREREQ(4,4) && defined(__ARM_EABI__)
+#define mcount		__gnu_mcount_nc
+#else
 #define mcount		_mcount
+#endif
 #endif
 
 #if defined(__ARM_EABI__)

Modified: branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/arm/____longjmp_chk.S
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/arm/____longjmp_chk.S (original)
+++ branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/arm/____longjmp_chk.S Mon Mar 21 10:52:27 2011
@@ -11,10 +11,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <sysdep.h>
 

Modified: branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S
==============================================================================
--- branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S (original)
+++ branches/eglibc-2_13/ports/sysdeps/unix/sysv/linux/arm/eabi/____longjmp_chk.S Mon Mar 21 10:52:27 2011
@@ -11,10 +11,10 @@
    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 General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   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 <sysdep.h>