From patchwork Thu Jun 12 04:41:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 358989 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 03F901400E9 for ; Thu, 12 Jun 2014 14:41:14 +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=nsJoRIEA6YBOYOn4uGCW3TWihwjki+O8VtArkWEhttISZ4 UDC322dWsXz9tzJqB/uokajT7K8gy9em11CRkM0gVWaGy+ZSP8bezZduBqVZ9CzN FKIG/+TI+ooirK80dWPoQAalnLLw+cOC+hcjbQukFK1gMu7izgbqJFpjcMiH8= 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=dYEEllJWDjvaldpzy3lzPYHjhBA=; b=w4sujC2H24uYn9NzJ1Um e+cZsSrFmD4KiUm4MhxZb0El6fDs04sJNaR/rc3gOIPYxI0hrkmsHZ09gMd46h4s o1vbzlegVJIPAWtpswuyzdnC14TokmjQmEkepOuJamaTpSsOtDIEZs0HvHPUEhIM wzd12VZUTvOUZa9HBtwF92M= Received: (qmail 2598 invoked by alias); 12 Jun 2014 04:41:10 -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 2581 invoked by uid 89); 12 Jun 2014 04:41:08 -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: [PATCH roland/nptl-sh] Move SH code out of nptl/ subdirectory. Message-Id: <20140612044104.CBC632C39BF@topped-with-meat.com> Date: Wed, 11 Jun 2014 21:41:04 -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=1LTTtU6SntgA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=K6-rVVqgrGUflyvQgJYA:9 a=CjuIK1q_8ugA:10 I haven't tested it or anything, but this should change nothing at all in compiled code or symbol tables. OK? Thanks, Roland * sysdeps/sh/Makefile [$(subdir) = csu] (gen-as-const-headers): Add tcb-offsets.sym. * nptl/sysdeps/sh/Makefile: File removed. * nptl/sysdeps/sh/pthread_spin_init.c: Moved ... * sysdeps/sh/nptl/pthread_spin_init.c: ... here. * nptl/sysdeps/sh/pthread_spin_lock.c: Moved ... * sysdeps/sh/nptl/pthread_spin_lock.c: ... here. * nptl/sysdeps/sh/pthread_spin_trylock.S: Moved ... * sysdeps/sh/nptl/pthread_spin_trylock.S: ... here. * nptl/sysdeps/sh/pthread_spin_unlock.S: Moved ... * sysdeps/sh/nptl/pthread_spin_unlock.S: ... here. * nptl/sysdeps/sh/pthreaddef.h: Moved ... * sysdeps/sh/nptl/pthreaddef.h: ... here. * nptl/sysdeps/sh/tcb-offsets.sym: Moved ... * sysdeps/sh/nptl/tcb-offsets.sym: ... here. * nptl/sysdeps/sh/tls.h: Moved ... * sysdeps/sh/nptl/tls.h: ... here. * nptl/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S: Moved ... * sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/lowlevel-atomic.h: Moved ... * sysdeps/unix/sysv/linux/sh/lowlevel-atomic.h: ... here. * nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S: Moved ... * sysdeps/unix/sysv/linux/sh/lowlevellock.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h: Moved ... * sysdeps/unix/sysv/linux/sh/lowlevellock.h: ... here. * nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S: Moved ... * sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S: Moved ... * sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S: Moved ... * sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S: Moved ... * sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S: Moved ... * sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S: Moved ... * sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S: Moved ... * sysdeps/unix/sysv/linux/sh/pthread_once.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S: Moved ... * sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S: Moved ... * sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S: Moved ... * sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S: Moved ... * sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S: Moved ... * sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/sem_post.S: Moved ... * sysdeps/unix/sysv/linux/sh/sem_post.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S: Moved ... * sysdeps/unix/sysv/linux/sh/sem_timedwait.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S: Moved ... * sysdeps/unix/sysv/linux/sh/sem_trywait.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S: Moved ... * sysdeps/unix/sysv/linux/sh/sem_wait.S: ... here. * nptl/sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h: Moved ... * sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h: ... here. * nptl/sysdeps/unix/sysv/linux/sh/smp.h: Moved ... * sysdeps/unix/sysv/linux/sh/smp.h: ... here. * nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: Moved ... * sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: ... here. diff --git a/nptl/sysdeps/sh/Makefile b/nptl/sysdeps/sh/Makefile deleted file mode 100644 index 81bddf6..0000000 --- a/nptl/sysdeps/sh/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(subdir),csu) -gen-as-const-headers += tcb-offsets.sym -endif diff --git a/sysdeps/sh/Makefile b/sysdeps/sh/Makefile index bb7c553..0c6db9a 100644 --- a/sysdeps/sh/Makefile +++ b/sysdeps/sh/Makefile @@ -1,3 +1,7 @@ +ifeq ($(subdir),csu) +gen-as-const-headers += tcb-offsets.sym +endif + ifeq ($(subdir),gmon) sysdep_routines += _mcount endif diff --git a/nptl/sysdeps/sh/pthread_spin_init.c b/sysdeps/sh/nptl/pthread_spin_init.c similarity index 100% rename from nptl/sysdeps/sh/pthread_spin_init.c rename to sysdeps/sh/nptl/pthread_spin_init.c diff --git a/nptl/sysdeps/sh/pthread_spin_lock.c b/sysdeps/sh/nptl/pthread_spin_lock.c similarity index 100% rename from nptl/sysdeps/sh/pthread_spin_lock.c rename to sysdeps/sh/nptl/pthread_spin_lock.c diff --git a/nptl/sysdeps/sh/pthread_spin_trylock.S b/sysdeps/sh/nptl/pthread_spin_trylock.S similarity index 100% rename from nptl/sysdeps/sh/pthread_spin_trylock.S rename to sysdeps/sh/nptl/pthread_spin_trylock.S diff --git a/nptl/sysdeps/sh/pthread_spin_unlock.S b/sysdeps/sh/nptl/pthread_spin_unlock.S similarity index 100% rename from nptl/sysdeps/sh/pthread_spin_unlock.S rename to sysdeps/sh/nptl/pthread_spin_unlock.S diff --git a/nptl/sysdeps/sh/pthreaddef.h b/sysdeps/sh/nptl/pthreaddef.h similarity index 100% rename from nptl/sysdeps/sh/pthreaddef.h rename to sysdeps/sh/nptl/pthreaddef.h diff --git a/nptl/sysdeps/sh/tcb-offsets.sym b/sysdeps/sh/nptl/tcb-offsets.sym similarity index 100% rename from nptl/sysdeps/sh/tcb-offsets.sym rename to sysdeps/sh/nptl/tcb-offsets.sym diff --git a/nptl/sysdeps/sh/tls.h b/sysdeps/sh/nptl/tls.h similarity index 100% rename from nptl/sysdeps/sh/tls.h rename to sysdeps/sh/nptl/tls.h diff --git a/nptl/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S b/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S rename to sysdeps/unix/sysv/linux/sh/libc-lowlevellock.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevel-atomic.h b/sysdeps/unix/sysv/linux/sh/lowlevel-atomic.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/lowlevel-atomic.h rename to sysdeps/unix/sysv/linux/sh/lowlevel-atomic.h diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/sysdeps/unix/sysv/linux/sh/lowlevellock.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S rename to sysdeps/unix/sysv/linux/sh/lowlevellock.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/sysdeps/unix/sysv/linux/sh/lowlevellock.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h rename to sysdeps/unix/sysv/linux/sh/lowlevellock.h diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S b/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S rename to sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S b/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S rename to sysdeps/unix/sysv/linux/sh/pthread_barrier_wait.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S b/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S rename to sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S b/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S rename to sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S b/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S rename to sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S b/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S rename to sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S b/sysdeps/unix/sysv/linux/sh/pthread_once.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S rename to sysdeps/unix/sysv/linux/sh/pthread_once.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S rename to sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S rename to sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S rename to sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S rename to sysdeps/unix/sysv/linux/sh/pthread_rwlock_unlock.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S b/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S rename to sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S b/sysdeps/unix/sysv/linux/sh/sem_post.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/sem_post.S rename to sysdeps/unix/sysv/linux/sh/sem_post.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S b/sysdeps/unix/sysv/linux/sh/sem_timedwait.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S rename to sysdeps/unix/sysv/linux/sh/sem_timedwait.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S b/sysdeps/unix/sysv/linux/sh/sem_trywait.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S rename to sysdeps/unix/sysv/linux/sh/sem_trywait.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S b/sysdeps/unix/sysv/linux/sh/sem_wait.S similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S rename to sysdeps/unix/sysv/linux/sh/sem_wait.S diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h b/sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h rename to sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h diff --git a/nptl/sysdeps/unix/sysv/linux/sh/smp.h b/sysdeps/unix/sysv/linux/sh/smp.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/smp.h rename to sysdeps/unix/sysv/linux/sh/smp.h diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h similarity index 100% rename from nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h rename to sysdeps/unix/sysv/linux/sh/sysdep-cancel.h