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 master updated. glibc-2.21-329-g7327b33


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  7327b333e56926d7d79bb9e01b839d3618bf750f (commit)
      from  8e65ea4dc05e32a2d461f9db8e570f2c0fcbecbc (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7327b333e56926d7d79bb9e01b839d3618bf750f

commit 7327b333e56926d7d79bb9e01b839d3618bf750f
Author: Roland McGrath <roland@hack.frob.com>
Date:   Tue May 12 10:54:47 2015 -0700

    NaCl: Provide non-default values for uname.

diff --git a/ChangeLog b/ChangeLog
index cd34a09..85234b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-05-12  Roland McGrath  <roland@hack.frob.com>
+
+	* posix/uname-values.h: New file.
+	* posix/uname.c: Include that instead of <config-name.h>.
+	* sysdeps/nacl/uname-values.h: New file.
+	* sysdeps/arm/nacl/uname-values.h: New file.
+
 2015-05-12  Joseph Myers  <joseph@codesourcery.com>
 
 	* conform/linknamespace.pl (list_syms): Remove \[.*?\] before
diff --git a/posix/uname-values.h b/posix/uname-values.h
new file mode 100644
index 0000000..1e01118
--- /dev/null
+++ b/posix/uname-values.h
@@ -0,0 +1,28 @@
+/* Constant values for the uname function to return.  Generic version.
+   Copyright (C) 2015 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/>.  */
+
+/* This file exists so that it can be replaced by sysdeps variants.
+   It must define these macros with string values:
+        UNAME_SYSNAME
+        UNAME_RELEASE
+        UNAME_VERSION
+        UNAME_MACHINE
+   If there is no sysdeps file, this file will just proxy to the file
+   created by posix/Makefile.  */
+
+#include <config-name.h>
diff --git a/posix/uname.c b/posix/uname.c
index d4276d3..072e868 100644
--- a/posix/uname.c
+++ b/posix/uname.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991-2015 Free Software Foundation, Inc.
+/* uname -- Report basic information about the system.  Generic version.
+   Copyright (C) 1991-2015 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
@@ -20,8 +21,8 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 
-/* This file is created by the configuration process, and defines UNAME_*.  */
-#include <config-name.h>
+/* This file defines UNAME_* to string constants.  */
+#include <uname-values.h>
 
 /* Put information about the system in NAME.  */
 int
diff --git a/sysdeps/arm/nacl/uname-values.h b/sysdeps/arm/nacl/uname-values.h
new file mode 100644
index 0000000..f1e11be
--- /dev/null
+++ b/sysdeps/arm/nacl/uname-values.h
@@ -0,0 +1,20 @@
+/* Constant values for the uname function to return.  NaCl/ARM version.
+   Copyright (C) 2015 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 UNAME_MACHINE "arm"
+#include <sysdeps/nacl/uname-values.h>
diff --git a/sysdeps/nacl/uname-values.h b/sysdeps/nacl/uname-values.h
new file mode 100644
index 0000000..b78eac5
--- /dev/null
+++ b/sysdeps/nacl/uname-values.h
@@ -0,0 +1,32 @@
+/* Constant values for the uname function to return.  NaCl version.
+   Copyright (C) 2015 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/>.  */
+
+/* This file must define these macros with string values:
+        UNAME_SYSNAME
+        UNAME_RELEASE
+        UNAME_VERSION
+        UNAME_MACHINE
+*/
+
+#ifndef UNAME_MACHINE
+# error "sysdeps/MACHINE/nacl/uname-values.h should define UNAME_MACHINE"
+#endif
+
+#define UNAME_SYSNAME "NaCl"
+#define UNAME_RELEASE "unknown"
+#define UNAME_VERSION "unknown"

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

Summary of changes:
 ChangeLog                       |    7 +++++++
 posix/uname-values.h            |   28 ++++++++++++++++++++++++++++
 posix/uname.c                   |    7 ++++---
 sysdeps/arm/nacl/uname-values.h |   20 ++++++++++++++++++++
 sysdeps/nacl/uname-values.h     |   32 ++++++++++++++++++++++++++++++++
 5 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 posix/uname-values.h
 create mode 100644 sysdeps/arm/nacl/uname-values.h
 create mode 100644 sysdeps/nacl/uname-values.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]