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

[Commits] r18308 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/arm/ sysdeps/unix/sysv/linux/arm/nptl/ sysdeps/unix/sysv/linux/mips...

To: commits@xxxxxxxxxx
Subject: [Commits] r18308 - in /fsf/trunk/ports: ./ sysdeps/unix/sysv/linux/arm/ sysdeps/unix/sysv/linux/arm/nptl/ sysdeps/unix/sysv/linux/mips...
From: eglibc@xxxxxxxxxx
Date: Wed, 02 May 2012 00:02:11 -0000

Author: eglibc
Date: Wed May  2 00:02:10 2012
New Revision: 18308

Log:
Import glibc-ports-mainline for 2012-05-02

Modified:
    fsf/trunk/ports/ChangeLog.arm
    fsf/trunk/ports/ChangeLog.mips
    fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/nptl/libc.abilist
    fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/profil-counter.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libc.abilist
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c

Modified: fsf/trunk/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/ports/ChangeLog.arm (original)
+++ fsf/trunk/ports/ChangeLog.arm Wed May  2 00:02:10 2012
@@ -1,3 +1,11 @@
+2012-05-01  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #14043]
+	* sysdeps/unix/sysv/linux/arm/profil-counter.h: New file.  Based
+	on i386 version but without "static".
+	* sysdeps/unix/sysv/linux/arm/nptl/libc.abilist (GLIBC_2.4): Add
+	profil_counter.
+
 2012-04-28  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	[BZ #13986]

Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Wed May  2 00:02:10 2012
@@ -1,3 +1,11 @@
+2012-05-01  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	[BZ #14044]
+	* sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c: Copy
+	from libc version and add symbol versions.
+	* sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libc.abilis
+	(GLIBC_2.3.3): Add posix_fadvise64.
+
 2012-04-28  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/mips32/nptl/ld.abilist: New file.

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/nptl/libc.abilist
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/nptl/libc.abilist (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/nptl/libc.abilist Wed May  2 00:02:10 2012
@@ -1421,6 +1421,7 @@
  printf_size F
  printf_size_info F
  profil F
+ profil_counter F
  program_invocation_name D 0x4
  program_invocation_short_name D 0x4
  pselect F

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/profil-counter.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/profil-counter.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/profil-counter.h Wed May  2 00:02:10 2012
@@ -1,2 +1,31 @@
-/* We can use the ix86 version.  */
-#include <sysdeps/unix/sysv/linux/i386/profil-counter.h>
+/* Low-level statistical profiling support function.  Linux/ARM version.
+   Copyright (C) 1996-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/>.  */
+
+#include <signal.h>
+#include <sigcontextinfo.h>
+
+void
+profil_counter (int signo, const SIGCONTEXT scp)
+{
+  profil_count ((void *) GET_PC (scp));
+
+  /* This is a hack to prevent the compiler from implementing the
+     above function call as a sibcall.  The sibcall would overwrite
+     the signal context.  */
+  asm volatile ("");
+}

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libc.abilist
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libc.abilist (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libc.abilist Wed May  2 00:02:10 2012
@@ -2045,6 +2045,7 @@
  inet6_option_space F
  nftw F
  nftw64 F
+ posix_fadvise64 F
  remap_file_pages F
  sched_getaffinity F
  sched_setaffinity F

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/posix_fadvise.c Wed May  2 00:02:10 2012
@@ -1,1 +1,50 @@
-#include <sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c>
+/* Copyright (C) 2003-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/>.  */
+
+#define posix_fadvise64 __no_posix_fadvise64
+#include <errno.h>
+#include <fcntl.h>
+#include <sysdep.h>
+#undef posix_fadvise64
+
+/* Advice the system about the expected behaviour of the application with
+   respect to the file associated with FD.  */
+
+int
+posix_fadvise (int fd, off_t offset, off_t len, int advise)
+{
+#ifdef __NR_fadvise64
+  INTERNAL_SYSCALL_DECL (err);
+  int ret = INTERNAL_SYSCALL (fadvise64, err, 4, fd, offset, len, advise);
+  if (INTERNAL_SYSCALL_ERROR_P (ret, err))
+    return INTERNAL_SYSCALL_ERRNO (ret, err);
+  return 0;
+#else
+  return ENOSYS;
+#endif
+}
+
+#include <shlib-compat.h>
+
+#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3)
+strong_alias (posix_fadvise, __posix_fadvise64_l32);
+compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2);
+strong_alias (posix_fadvise, __posix_fadvise64_l64);
+versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3);
+#else
+strong_alias (posix_fadvise, posix_fadvise64);
+#endif

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

Prev by Date: [Commits] r18307 - in /fsf/trunk/libc: ./ conform/ conform/data/ conform/data/netinet/ elf/ math/ scripts/ sysdeps/i386/fpu/ sysdeps/i...
Next by Date: [Commits] r18309 - in /fsf/glibc-2_15-branch/libc: ./ math/ sysdeps/ieee754/dbl-64/ sysdeps/ieee754/flt-32/ sysdeps/ieee754/ldbl-128/ ...
Previous by thread: [Commits] r18307 - in /fsf/trunk/libc: ./ conform/ conform/data/ conform/data/netinet/ elf/ math/ scripts/ sysdeps/i386/fpu/ sysdeps/i...
Next by thread: [Commits] r18309 - in /fsf/glibc-2_15-branch/libc: ./ math/ sysdeps/ieee754/dbl-64/ sysdeps/ieee754/flt-32/ sysdeps/ieee754/ldbl-128/ ...
Index(es):
- Date
- Thread