From patchwork Wed May 14 17:42:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 348898 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 A63D6140094 for ; Thu, 15 May 2014 03:42:24 +1000 (EST) 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=KTuZO5TmXqOp8BzF+C+gjyaqpRw7/KnZMYjDCQiU0sWseO y9ETj9lPeU1z2Blvxnof0jEN2SXKiCLqPJaT7qjeR72K5H5ibm+d7lBfyXuSYGDg bNap8KG78ih5PnZyWey51Vxu4RIz/0x0xRIwUkDePp8DCxLdrPE2JwhJzQego= 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=2Re8oh6hZnBcVG2XgmbGjVeeNu0=; b=ALAMn5bYNBK/TVBz/vb1 5EBqggPRMx4YjPMU12jbeEL7tsWwlH9Y86v3PhDH/Ok18bawRsJFyeZ8TjBxjXpI adPQZ5blijmDLbJLXcB3kK6DsLPRnNOmPOLnR6xy0QFEFA7dxew2Lt2s6A1ty5J5 xWM9ZZyBE7WUfft0pL01WPk= Received: (qmail 24144 invoked by alias); 14 May 2014 17:42:18 -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 24123 invoked by uid 89); 14 May 2014 17:42:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] Move x86_64 timer_*.c out of nptl/ Message-Id: <20140514174214.BCFD12C3A4D@topped-with-meat.com> Date: Wed, 14 May 2014 10:42:14 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=HrjlRSjS c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=Wy2zlH_0MzIA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=yExe-uSgDKvTFl5ay2sA:9 a=CjuIK1q_8ugA:10 Verified on x86_64-linux-gnu that no librt.so code changes. I didn't verify the sparc or powerpc builds that are affected by this. If I somehow managed to break them it should be just trivial typo fixes. Thanks, Roland * nptl/sysdeps/unix/sysv/linux/x86_64/Versions: Remove, merge into ... * sysdeps/unix/sysv/linux/x86_64/Versions: ... here. * nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c: Moved ... * sysdeps/unix/sysv/linux/x86_64/timer_create.c: here. * nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c: Moved ... * sysdeps/unix/sysv/linux/x86_64/timer_delete.c: ... here * nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c: Moved ... * sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c: ... here * nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c: Moved ... * sysdeps/unix/sysv/linux/x86_64/timer_gettime.c: ... here * nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c: Moved ... * sysdeps/unix/sysv/linux/x86_64/timer_settime.c: ... here * nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c: Update #include. * nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c: Likewise. * nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c: Likewise. * nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c: Likewise. * nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c: Likewise. * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c: Likewise. * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c: Likewise. * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c: Likewise. * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c: Likewise. * nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c: Likewise. --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_create.c @@ -1 +1 @@ -#include "../x86_64/timer_create.c" +#include --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_delete.c @@ -1 +1 @@ -#include "../x86_64/timer_delete.c" +#include --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_getoverr.c @@ -1 +1 @@ -#include "../x86_64/timer_getoverr.c" +#include --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_gettime.c @@ -1 +1 @@ -#include "../x86_64/timer_gettime.c" +#include --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/timer_settime.c @@ -1 +1 @@ -#include "../x86_64/timer_settime.c" +#include --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_create.c @@ -1 +1 @@ -#include "../../x86_64/timer_create.c" +#include --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_delete.c @@ -1 +1 @@ -#include "../../x86_64/timer_delete.c" +#include --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_getoverr.c @@ -1 +1 @@ -#include "../../x86_64/timer_getoverr.c" +#include --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c @@ -1 +1 @@ -#include "../../x86_64/timer_gettime.c" +#include --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/timer_settime.c @@ -1 +1 @@ -#include "../../x86_64/timer_settime.c" +#include --- a/nptl/sysdeps/unix/sysv/linux/x86_64/Versions +++ /dev/null @@ -1,7 +0,0 @@ -librt { - GLIBC_2.3.3 { - # Changed timer_t. - timer_create; timer_delete; timer_getoverrun; timer_gettime; - timer_settime; - } -} --- a/sysdeps/unix/sysv/linux/x86_64/Versions +++ b/sysdeps/unix/sysv/linux/x86_64/Versions @@ -10,3 +10,11 @@ libc { __vdso_clock_gettime; } } + +librt { + GLIBC_2.3.3 { + # Changed timer_t. + timer_create; timer_delete; timer_getoverrun; timer_gettime; + timer_settime; + } +} --- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c +++ b/sysdeps/unix/sysv/linux/x86_64/timer_create.c @@ -22,7 +22,7 @@ #define timer_create_alias __timer_create_new -#include "../timer_create.c" +#include #undef timer_create versioned_symbol (librt, __timer_create_new, timer_create, GLIBC_2_3_3); --- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c +++ b/sysdeps/unix/sysv/linux/x86_64/timer_delete.c @@ -21,7 +21,7 @@ #define timer_delete_alias __timer_delete_new -#include "../timer_delete.c" +#include #undef timer_delete versioned_symbol (librt, __timer_delete_new, timer_delete, GLIBC_2_3_3); --- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c +++ b/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c @@ -21,7 +21,7 @@ #define timer_getoverrun_alias __timer_getoverrun_new -#include "../timer_getoverr.c" +#include #undef timer_getoverrun versioned_symbol (librt, __timer_getoverrun_new, timer_getoverrun, --- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c +++ b/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c @@ -21,7 +21,7 @@ #define timer_gettime_alias __timer_gettime_new -#include "../timer_gettime.c" +#include #undef timer_gettime versioned_symbol (librt, __timer_gettime_new, timer_gettime, GLIBC_2_3_3); --- a/nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c +++ b/sysdeps/unix/sysv/linux/x86_64/timer_settime.c @@ -21,7 +21,7 @@ #define timer_settime_alias __timer_settime_new -#include "../timer_settime.c" +#include #undef timer_settime versioned_symbol (librt, __timer_settime_new, timer_settime, GLIBC_2_3_3);