From patchwork Wed May 14 22:40:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 348996 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 06EAB140080 for ; Thu, 15 May 2014 08:40:33 +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=pTLKQtAieDXbzXAml+HGX0tTEFCg0VoHkPqt544Wr7575V kJEvNqH9HARE56LZJuRTEPAEWfVl5xnqsbvvRFDDvdCDmSzuRxGnUwyZr/VeYYDD m7vlponThJnujVKLyXBNMcYHng+22IzQ/F7JbAwqw/+PQ5IjICeRK+wosHqYQ= 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=8EjwqcQt4pQfjL+Q5lmOJO7FDg4=; b=Lcw6/X6DWbQpPfDnQMDZ BaIZ8jV6vIbGAJLtNN1WMdpQ58TTbvmqV/mrO4xzp4lllxarsKDnxOKGUsqzVyeu +o5c6hBdP1P4dob9yh6wTYGLEHjyisNKxPuKcKNZeGzDZCnh5BmL5CcVJEWDi/Zn aN2hd6dPi5m6WPs67Zm/D5Y= Received: (qmail 5786 invoked by alias); 14 May 2014 22:40:28 -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 5771 invoked by uid 89); 14 May 2014 22:40:28 -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 remaining files out of nptl/sysdeps/unix/sysv/linux/x86/. Message-Id: <20140514224025.75D592C3A55@topped-with-meat.com> Date: Wed, 14 May 2014 15:40:25 -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=XfflAJMd1xoA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=A2upfMxCDVdCk7HTdmUA:9 a=CjuIK1q_8ugA:10 Verified no code changes on x86_64-linux-gnu and i686-linux-gnu. Thanks, Roland * nptl/sysdeps/unix/sysv/linux/x86/Makefile: File removed. * sysdeps/unix/sysv/linux/x86/Makefile [$(subdir) = nptl] (libpthread-sysdep_routines): Add elision-related stuff here instead. * nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c: Moved ... * sysdeps/unix/sysv/linux/x86/elision-conf.c: ... here. * nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h: Moved ... * sysdeps/unix/sysv/linux/x86/elision-conf.h: ... here. * nptl/sysdeps/unix/sysv/linux/x86/elision-lock.c: Moved ... * sysdeps/unix/sysv/linux/x86/elision-lock.c: ... here. * nptl/sysdeps/unix/sysv/linux/x86/elision-timed.c: Moved ... * sysdeps/unix/sysv/linux/x86/elision-timed.c: ... here. * nptl/sysdeps/unix/sysv/linux/x86/elision-trylock.c: Moved ... * sysdeps/unix/sysv/linux/x86/elision-trylock.c: ... here. * nptl/sysdeps/unix/sysv/linux/x86/elision-unlock.c: Moved ... * sysdeps/unix/sysv/linux/x86/elision-unlock.c: ... here. * nptl/sysdeps/unix/sysv/linux/x86/force-elision.h: Moved ... * sysdeps/unix/sysv/linux/x86/force-elision.h: ... here. * nptl/sysdeps/unix/sysv/linux/x86/hle.h: Moved ... * sysdeps/unix/sysv/linux/x86/hle.h: ... here. * nptl/sysdeps/unix/sysv/linux/x86/init-arch.c: Moved ... * sysdeps/unix/sysv/linux/x86/init-arch.c: ... here. * nptl/sysdeps/unix/sysv/linux/x86/init-arch.h: Moved ... * sysdeps/unix/sysv/linux/x86/init-arch.h: ... here. * nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c: Moved ... * sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c: ... here. * nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c: Moved ... * sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c: ... here. * nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c: Moved ... * sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c: ... here. * nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c: Moved ... * sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c: ... here. diff --git a/nptl/sysdeps/unix/sysv/linux/x86/Makefile b/nptl/sysdeps/unix/sysv/linux/x86/Makefile deleted file mode 100644 index 61b7552..0000000 --- a/nptl/sysdeps/unix/sysv/linux/x86/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -libpthread-sysdep_routines += init-arch -libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \ - elision-trylock diff --git a/sysdeps/unix/sysv/linux/x86/Makefile b/sysdeps/unix/sysv/linux/x86/Makefile index 6412a9e..012125f 100644 --- a/sysdeps/unix/sysv/linux/x86/Makefile +++ b/sysdeps/unix/sysv/linux/x86/Makefile @@ -16,3 +16,9 @@ abi-x32-ld-soname := ld-linux-x32.so.2 ifeq ($(subdir),misc) sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h endif + +ifeq ($(subdir),nptl) +libpthread-sysdep_routines += init-arch +libpthread-sysdep_routines += elision-lock elision-unlock elision-timed \ + elision-trylock +endif diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c b/sysdeps/unix/sysv/linux/x86/elision-conf.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c rename to sysdeps/unix/sysv/linux/x86/elision-conf.c diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h b/sysdeps/unix/sysv/linux/x86/elision-conf.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h rename to sysdeps/unix/sysv/linux/x86/elision-conf.h diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-lock.c b/sysdeps/unix/sysv/linux/x86/elision-lock.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/elision-lock.c rename to sysdeps/unix/sysv/linux/x86/elision-lock.c diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-timed.c b/sysdeps/unix/sysv/linux/x86/elision-timed.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/elision-timed.c rename to sysdeps/unix/sysv/linux/x86/elision-timed.c diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-trylock.c b/sysdeps/unix/sysv/linux/x86/elision-trylock.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/elision-trylock.c rename to sysdeps/unix/sysv/linux/x86/elision-trylock.c diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-unlock.c b/sysdeps/unix/sysv/linux/x86/elision-unlock.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/elision-unlock.c rename to sysdeps/unix/sysv/linux/x86/elision-unlock.c diff --git a/nptl/sysdeps/unix/sysv/linux/x86/force-elision.h b/sysdeps/unix/sysv/linux/x86/force-elision.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/force-elision.h rename to sysdeps/unix/sysv/linux/x86/force-elision.h diff --git a/nptl/sysdeps/unix/sysv/linux/x86/hle.h b/sysdeps/unix/sysv/linux/x86/hle.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/hle.h rename to sysdeps/unix/sysv/linux/x86/hle.h diff --git a/nptl/sysdeps/unix/sysv/linux/x86/init-arch.c b/sysdeps/unix/sysv/linux/x86/init-arch.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/init-arch.c rename to sysdeps/unix/sysv/linux/x86/init-arch.c diff --git a/nptl/sysdeps/unix/sysv/linux/x86/init-arch.h b/sysdeps/unix/sysv/linux/x86/init-arch.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/init-arch.h rename to sysdeps/unix/sysv/linux/x86/init-arch.h diff --git a/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c b/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c rename to sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c diff --git a/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c b/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c rename to sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c diff --git a/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c b/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c rename to sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c diff --git a/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c b/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c rename to sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c