This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, hjl/x32/master, updated. glibc-2.15-1362-ge52c80d


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, hjl/x32/master has been updated
       via  e52c80d89a0beb5f3358384da45c6f9659cfd8cc (commit)
       via  c9009328789acfca816c5ea0337ce0d0479b8fe5 (commit)
       via  79d93ba35b473cf363bae80531a3e6f94be9222e (commit)
       via  73338355920056d87648c65ccba9a875c289b37e (commit)
       via  e2d6cea0a17ecd7ed32b2137e38d44d956d09316 (commit)
       via  12858cbf20ede76c34225c292a785b1a8e06700a (commit)
       via  d44638b0a7fc1f01c3b2153cfa1bbb849f01f217 (commit)
       via  da0331a873dbb62462c151c3d824da2f6fe2e770 (commit)
       via  31a39bd8410d366ee03b9e48e9d56b8099868f26 (commit)
       via  45470df3787aa9e97db24635b8b33066531430ad (commit)
      from  e4729888f51119d8b2ab7c478b9a35e05719f54f (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=e52c80d89a0beb5f3358384da45c6f9659cfd8cc

commit e52c80d89a0beb5f3358384da45c6f9659cfd8cc
Merge: 79d93ba c900932
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue May 22 13:48:08 2012 -0700

    Merge remote-tracking branch 'origin/master' into hjl/x32/master


http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=79d93ba35b473cf363bae80531a3e6f94be9222e

commit 79d93ba35b473cf363bae80531a3e6f94be9222e
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue May 22 13:36:34 2012 -0700

    Remove conditionals and add some comments

diff --git a/ChangeLog.x32 b/ChangeLog.x32
index f08b0c2..3e69f98 100644
--- a/ChangeLog.x32
+++ b/ChangeLog.x32
@@ -1,5 +1,12 @@
 2012-05-22  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* sysdeps/unix/sysv/linux/sysctl.mk: Remove conditionals and
+	add some comments.
+	* sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk: Remove
+	conditionals.
+
+2012-05-22  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* sysdeps/unix/sysv/linux/sys/sysctl.h: Include <bits/sysctl.h>.
 	* sysdeps/unix/sysv/linux/bits/sysctl.h: New file.
 	* sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h: Likewise.
diff --git a/sysdeps/unix/sysv/linux/sysctl.mk b/sysdeps/unix/sysv/linux/sysctl.mk
index ac407a6..79d5998 100644
--- a/sysdeps/unix/sysv/linux/sysctl.mk
+++ b/sysdeps/unix/sysv/linux/sysctl.mk
@@ -1,3 +1,3 @@
-ifeq ($(subdir),misc)
+# sysctl system call has been deprecated.  It is provided for backward
+# compatility.  New target should override it (see x86_64/x32/sysctl.mk).
 sysctl = sysctl
-endif
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk b/sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk
index e939081..cdca4ef 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk
@@ -1,4 +1,2 @@
 # X32 doesn't support sysctl.
-ifeq ($(subdir),misc)
 sysctl =
-endif

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=12858cbf20ede76c34225c292a785b1a8e06700a

commit 12858cbf20ede76c34225c292a785b1a8e06700a
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue May 22 13:09:56 2012 -0700

    Add bits/sysctl.h

diff --git a/ChangeLog.x32 b/ChangeLog.x32
index 5cd5025..f08b0c2 100644
--- a/ChangeLog.x32
+++ b/ChangeLog.x32
@@ -1,9 +1,16 @@
 2012-05-22  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* sysdeps/unix/sysv/linux/sys/sysctl.h: Include <bits/sysctl.h>.
+	* sysdeps/unix/sysv/linux/bits/sysctl.h: New file.
+	* sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h: Likewise.
+
+	* sysdeps/unix/sysv/linux/x86_64/sys/sysctl.h: Remvoed.
+
+2012-05-22  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* sysdeps/unix/sysv/linux/Makefile: Include
 	$(firstword $(wildcard $(sysdirs:=/sysctl.mk))).
 	(sysdep_routines): Replace sysctl with $(sysctl).
-
 	* sysdeps/unix/sysv/linux/sysctl.mk: New file.
 	* sysdeps/unix/sysv/linux/x86_64/sys/sysctl.h: Likewise.
 	* sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk: Likewise.
diff --git a/sysdeps/unix/sysv/linux/bits/sysctl.h b/sysdeps/unix/sysv/linux/bits/sysctl.h
new file mode 100644
index 0000000..81447b2
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/bits/sysctl.h
@@ -0,0 +1 @@
+/* Empty file.  */
diff --git a/sysdeps/unix/sysv/linux/sys/sysctl.h b/sysdeps/unix/sysv/linux/sys/sysctl.h
index 2c2d688..cfa71ad 100644
--- a/sysdeps/unix/sysv/linux/sys/sysctl.h
+++ b/sysdeps/unix/sysv/linux/sys/sysctl.h
@@ -60,6 +60,8 @@
 # undef __undef__LINUX_COMPILER_H
 #endif
 
+#include <bits/sysctl.h>
+
 __BEGIN_DECLS
 
 /* Read or write system parameters.  */
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h b/sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h
new file mode 100644
index 0000000..520ccb9
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h
@@ -0,0 +1,20 @@
+/* Copyright (C) 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/>.  */
+
+#if defined __x86_64__ && defined __ILP32__
+# error "sysctl system call is unsupported in x32 kernel"
+#endif
diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/sysctl.h b/sysdeps/unix/sysv/linux/x86_64/sys/sysctl.h
deleted file mode 100644
index c488d99..0000000
--- a/sysdeps/unix/sysv/linux/x86_64/sys/sysctl.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* 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/>.  */
-
-#ifndef	_SYS_SYSCTL_H
-#define	_SYS_SYSCTL_H	1
-
-#if defined __x86_64__ && defined __ILP32__
-# error "sysctl system call is unsupported in x32 kernel"
-#endif
-
-#include <features.h>
-#define __need_size_t
-#include <stddef.h>
-/* Prevent more kernel headers than necessary to be included.  */
-#ifndef _LINUX_KERNEL_H
-# define _LINUX_KERNEL_H	1
-# define __undef_LINUX_KERNEL_H
-#endif
-#ifndef _LINUX_TYPES_H
-# define _LINUX_TYPES_H		1
-# define __undef_LINUX_TYPES_H
-#endif
-#ifndef _LINUX_LIST_H
-# define _LINUX_LIST_H		1
-# define __undef_LINUX_LIST_H
-#endif
-#ifndef __LINUX_COMPILER_H
-# define __LINUX_COMPILER_H	1
-# define __user
-# define __undef__LINUX_COMPILER_H
-#endif
-
-#include <linux/sysctl.h>
-
-#ifdef __undef_LINUX_KERNEL_H
-# undef _LINUX_KERNEL_H
-# undef __undef_LINUX_KERNEL_H
-#endif
-#ifdef __undef_LINUX_TYPES_H
-# undef _LINUX_TYPES_H
-# undef __undef_LINUX_TYPES_H
-#endif
-#ifdef __undef_LINUX_LIST_H
-# undef _LINUX_LIST_H
-# undef __undef_LINUX_LIST_H
-#endif
-#ifdef __undef__LINUX_COMPILER_H
-# undef __LINUX_COMPILER_H
-# undef __user
-# undef __undef__LINUX_COMPILER_H
-#endif
-
-__BEGIN_DECLS
-
-/* Read or write system parameters.  */
-extern int sysctl (int *__name, int __nlen, void *__oldval,
-		   size_t *__oldlenp, void *__newval, size_t __newlen) __THROW;
-
-__END_DECLS
-
-#endif	/* _SYS_SYSCTL_H */

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

Summary of changes:
 ChangeLog                                          |   55 ++++++++++++
 ChangeLog.x32                                      |   16 +++-
 NEWS                                               |    2 +-
 nss/nsswitch.c                                     |   94 +++++++++++++++-----
 sysdeps/powerpc/powerpc32/power6/fpu/s_copysign.S  |    9 ++-
 sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S    |   11 ++-
 sysdeps/powerpc/powerpc32/power7/fpu/s_logb.c      |    8 +-
 sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S  |    7 +-
 sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S    |    9 ++-
 sysdeps/unix/sysv/linux/bits/sysctl.h              |    1 +
 sysdeps/unix/sysv/linux/sys/sysctl.h               |    2 +
 sysdeps/unix/sysv/linux/sysctl.mk                  |    4 +-
 .../sysv/linux/x86_64/bits/sysctl.h}               |   11 +--
 sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S      |   14 ++-
 sysdeps/unix/sysv/linux/x86_64/sys/sysctl.h        |   75 ----------------
 sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk       |    2 -
 16 files changed, 190 insertions(+), 130 deletions(-)
 create mode 100644 sysdeps/unix/sysv/linux/bits/sysctl.h
 copy sysdeps/{x86_64/tst-quad1.c => unix/sysv/linux/x86_64/bits/sysctl.h} (87%)
 delete mode 100644 sysdeps/unix/sysv/linux/x86_64/sys/sysctl.h


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]