GNU C Library master sources branch, master, updated. glibc-2.16-ports-merge-109-g5d9eaee

[roland 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, master has been updated
       via  5d9eaeecb451dc85479c1905d41a0b41c6d8b1d0 (commit)
      from  b8625cfc6f629f146aa3944b5cfc65025884bd44 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

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

commit 5d9eaeecb451dc85479c1905d41a0b41c6d8b1d0
Author: Roland McGrath <roland@hack.frob.com>
Date:   Wed Aug 1 11:39:08 2012 -0700

    Move Linuxism out of sysdeps/arm/dl-machine.h.

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 2b109db..bbf9c68 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,5 +1,9 @@
 2012-08-01  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/arm/dl-machine.h (CLEAR_CACHE): Don't define it.
+	Instead, #error if it's not defined.
+	* sysdeps/unix/sysv/linux/arm/dl-machine.h: New file.
+
 	[BZ #14138]
 	* sysdeps/unix/sysv/linux/arm/getrlimit.c: File removed.
 
diff --git a/ports/sysdeps/arm/dl-machine.h b/ports/sysdeps/arm/dl-machine.h
index 8d905e8..442fc3d 100644
--- a/ports/sysdeps/arm/dl-machine.h
+++ b/ports/sysdeps/arm/dl-machine.h
@@ -1,6 +1,5 @@
 /* Machine-dependent ELF dynamic relocation inline functions.  ARM version.
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,
-	2006, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-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
@@ -27,8 +26,9 @@
 #include <dl-tlsdesc.h>
 #include <dl-irel.h>
 
-#define CLEAR_CACHE(BEG,END)						\
-  INTERNAL_SYSCALL_ARM (cacheflush, , 3, (BEG), (END), 0)
+#ifndef CLEAR_CACHE
+# error CLEAR_CACHE definition required to handle TEXTREL
+#endif
 
 /* Return nonzero iff ELF header is compatible with the running host.  */
 static inline int __attribute__ ((unused))
diff --git a/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h b/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h
new file mode 100644
index 0000000..7c96cb7
--- /dev/null
+++ b/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h
@@ -0,0 +1,28 @@
+/* Machine-dependent ELF dynamic relocation inline functions.  ARM/Linux version
+   Copyright (C) 1995-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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   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 Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef dl_machine_h
+
+/* This definition is Linux-specific.  */
+#define CLEAR_CACHE(BEG,END)                                            \
+  INTERNAL_SYSCALL_ARM (cacheflush, , 3, (BEG), (END), 0)
+
+/* The rest is just machine-specific.  */
+#include <sysdeps/arm/dl-machine.h>
+
+#endif

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

Summary of changes:
 ports/ChangeLog.arm                                |    4 ++++
 ports/sysdeps/arm/dl-machine.h                     |    8 ++++----
 .../{mips/_test_and_set.c => arm/dl-machine.h}     |   19 +++++++++----------
 3 files changed, 17 insertions(+), 14 deletions(-)
 copy ports/sysdeps/unix/sysv/linux/{mips/_test_and_set.c => arm/dl-machine.h} (69%)


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