From patchwork Tue May 12 17:57:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 471473 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BC681400B7 for ; Wed, 13 May 2015 03:57:41 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sourceware.org header.i=@sourceware.org header.b=ABPVjyjT; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=PDyErtmW1EUeO09oWB1FvzWqJo9OODp6m7PUC5mg8DOw3K whCVUa4IJvNllElANO1u4dCAfri3swULETbdE4x/lTd+K61FoAcdVu8X0uKtUxeJ HJfgk6piQRBOcWoFWHRrzzltcGzypYxjiUTw65xnarxHfVtecAZTvox7vDXGI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=vZnv+YtHTGH9o/YwBxvXd+Bgoms=; b=ABPVjyjTxQ5IAISSZKmF GzXnpqws9h32aIoaVwwLpjQktfnofJlL6DETrEa2wvO65ubQGxyn46o6E9vlgwvz GZemv97RXDkHWoAjdAtnzBZYZmAt5Z161j356Y1FEbiuaf+6oXExBsYjQiz7qsjQ vXYth/NqpJMCh6N5gkOe2R4= Received: (qmail 16263 invoked by alias); 12 May 2015 17:57:33 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 16154 invoked by uid 89); 12 May 2015 17:57:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] NaCl: Provide non-default values for uname. Message-Id: <20150512175729.14F072C3AB9@topped-with-meat.com> Date: Tue, 12 May 2015 10:57:29 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=mDV3o1hIAAAA:8 a=IdKSsG3r7onzOdDEUngA:9 a=CjuIK1q_8ugA:10 2015-05-12 Roland McGrath * posix/uname-values.h: New file. * posix/uname.c: Include that instead of . * sysdeps/nacl/uname-values.h: New file. * sysdeps/arm/nacl/uname-values.h: New file. 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 + . */ + +/* 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 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 #include -/* This file is created by the configuration process, and defines UNAME_*. */ -#include +/* This file defines UNAME_* to string constants. */ +#include /* 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 + . */ + +#define UNAME_MACHINE "arm" +#include 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 + . */ + +/* 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"