[Commits] r17386 - in /branches/eglibc-2_15: ./ ports/ChangeLog.arm ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S

[joseph@xxxxxxxxxx]

Author: joseph
Date: Sat Mar  3 18:28:35 2012
New Revision: 17386

Log:
Merge changes between r16525 and r17385 from /fsf/glibc-2_15-branch.

Modified:
    branches/eglibc-2_15/   (props changed)
    branches/eglibc-2_15/ports/ChangeLog.arm
    branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S

Propchange: branches/eglibc-2_15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  3 18:28:35 2012
@@ -1,2 +1,2 @@
-/fsf/glibc-2_15-branch:16509-16525
+/fsf/glibc-2_15-branch:16509-17385
 /fsf/trunk:15224-16494

Modified: branches/eglibc-2_15/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_15/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_15/ports/ChangeLog.arm Sat Mar  3 18:28:35 2012
@@ -1,3 +1,9 @@
+2012-02-15  Khem Raj  <raj.khem@xxxxxxxxx>
+
+	[BZ #12097]
+	* sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S: Disable
+	contents unless __thumb__.
+
 2012-01-03  Mike Frysinger  <vapier@xxxxxxxxxx>
 
 	[BZ #12354]

Modified: branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
==============================================================================
--- branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S (original)
+++ branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S Sat Mar  3 18:28:35 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2010-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
@@ -25,6 +25,7 @@
    ARM unwind tables for register to register moves, the actual opcodes
    are not defined.  */
 
+#if defined(__thumb__)
 	.thumb
 	.syntax unified
 	.hidden __libc_do_syscall
@@ -44,3 +45,5 @@
 	pop	{r7, pc}
 	.fnend
 END (__libc_do_syscall)
+
+#endif /* __thumb__ */

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