aarch64: Move remaining sysdeps/unix/sysv/linux/aarch64/nptl/ files
diff mbox

Message ID 1401818095-15788-1-git-send-email-rth@twiddle.net
State New
Headers show

Commit Message

Richard Henderson June 3, 2014, 5:54 p.m. UTC
From: Richard Henderson <rth@redhat.com>

Now that vfork and clone are cared for, the rest of the move
away from the nptl subdirectory is pure file movement.  We
don't even have to merge Makefile or Versions files.

Ok?


r~

---
	* sysdeps/unix/sysv/linux/aarch64/nptl/bits/local_lim.h: Move...
	* sysdeps/unix/sysv/linux/aarch64/bits/local_lim.h: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h: Move...
	* sysdeps/unix/sysv/linux/aarch64/bits/pthreadtypes.h: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/bits/semaphore.h: Move...
	* sysdeps/unix/sysv/linux/aarch64/bits/semaphore.h: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/c++-types.data: Move...
	* sysdeps/unix/sysv/linux/aarch64/c++-types.data: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/createthread.c: Move...
	* sysdeps/unix/sysv/linux/aarch64/createthread.c: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/ld.abilist: Move...
	* sysdeps/unix/sysv/linux/aarch64/ld.abilist: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/libBrokenLocale.abilist: Move...
	* sysdeps/unix/sysv/linux/aarch64/libBrokenLocale.abilist: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/libanl.abilist: Move...
	* sysdeps/unix/sysv/linux/aarch64/libanl.abilist: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/libc.abilist: Move...
	* sysdeps/unix/sysv/linux/aarch64/libc.abilist: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/libcrypt.abilist: Move...
	* sysdeps/unix/sysv/linux/aarch64/libcrypt.abilist: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/libdl.abilist: Move...
	* sysdeps/unix/sysv/linux/aarch64/libdl.abilist: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/libm.abilist: Move...
	* sysdeps/unix/sysv/linux/aarch64/libm.abilist: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/libnsl.abilist: Move...
	* sysdeps/unix/sysv/linux/aarch64/libnsl.abilist: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/libpthread.abilist: Move...
	* sysdeps/unix/sysv/linux/aarch64/libpthread.abilist: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/libresolv.abilist: Move...
	* sysdeps/unix/sysv/linux/aarch64/libresolv.abilist: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/librt.abilist: Move...
	* sysdeps/unix/sysv/linux/aarch64/librt.abilist: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/libthread_db.abilist: Move...
	* sysdeps/unix/sysv/linux/aarch64/libthread_db.abilist: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/libutil.abilist: Move...
	* sysdeps/unix/sysv/linux/aarch64/libutil.abilist: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/localplt.data: Move...
	* sysdeps/unix/sysv/linux/aarch64/localplt.data: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h: Move...
	* sysdeps/unix/sysv/linux/aarch64/lowlevellock.h: ... here.
	* sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h: Move...
	* sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h: ... here.

---
 ChangeLog                                          | 45 ++++++++++++++++++++++
 .../sysv/linux/aarch64/{nptl => }/bits/local_lim.h |  0
 .../linux/aarch64/{nptl => }/bits/pthreadtypes.h   |  0
 .../sysv/linux/aarch64/{nptl => }/bits/semaphore.h |  0
 .../sysv/linux/aarch64/{nptl => }/c++-types.data   |  0
 .../sysv/linux/aarch64/{nptl => }/createthread.c   |  0
 .../unix/sysv/linux/aarch64/{nptl => }/ld.abilist  |  0
 .../aarch64/{nptl => }/libBrokenLocale.abilist     |  0
 .../sysv/linux/aarch64/{nptl => }/libanl.abilist   |  0
 .../sysv/linux/aarch64/{nptl => }/libc.abilist     |  0
 .../sysv/linux/aarch64/{nptl => }/libcrypt.abilist |  0
 .../sysv/linux/aarch64/{nptl => }/libdl.abilist    |  0
 .../sysv/linux/aarch64/{nptl => }/libm.abilist     |  0
 .../sysv/linux/aarch64/{nptl => }/libnsl.abilist   |  0
 .../linux/aarch64/{nptl => }/libpthread.abilist    |  0
 .../linux/aarch64/{nptl => }/libresolv.abilist     |  0
 .../sysv/linux/aarch64/{nptl => }/librt.abilist    |  0
 .../linux/aarch64/{nptl => }/libthread_db.abilist  |  0
 .../sysv/linux/aarch64/{nptl => }/libutil.abilist  |  0
 .../sysv/linux/aarch64/{nptl => }/localplt.data    |  0
 .../sysv/linux/aarch64/{nptl => }/lowlevellock.h   |  0
 .../sysv/linux/aarch64/{nptl => }/sysdep-cancel.h  |  0
 22 files changed, 45 insertions(+)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/bits/local_lim.h (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/bits/pthreadtypes.h (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/bits/semaphore.h (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/c++-types.data (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/createthread.c (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/ld.abilist (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/libBrokenLocale.abilist (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/libanl.abilist (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/libc.abilist (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/libcrypt.abilist (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/libdl.abilist (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/libm.abilist (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/libnsl.abilist (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/libpthread.abilist (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/libresolv.abilist (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/librt.abilist (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/libthread_db.abilist (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/libutil.abilist (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/localplt.data (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/lowlevellock.h (100%)
 rename sysdeps/unix/sysv/linux/aarch64/{nptl => }/sysdep-cancel.h (100%)

Comments

Roland McGrath June 3, 2014, 6:05 p.m. UTC | #1
That looks adequate.  But...

> 	* sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h: Move...
> 	* sysdeps/unix/sysv/linux/aarch64/bits/pthreadtypes.h: ... here.
> 	* sysdeps/unix/sysv/linux/aarch64/nptl/bits/semaphore.h: Move...
> 	* sysdeps/unix/sysv/linux/aarch64/bits/semaphore.h: ... here.

These could go into sysdeps/aarch64/nptl/bits/ instead.


Thanks,
Roland
Richard Henderson June 5, 2014, 4:01 p.m. UTC | #2
On 06/03/2014 11:05 AM, Roland McGrath wrote:
> That looks adequate.  But...
> 
>> 	* sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h: Move...
>> 	* sysdeps/unix/sysv/linux/aarch64/bits/pthreadtypes.h: ... here.
>> 	* sysdeps/unix/sysv/linux/aarch64/nptl/bits/semaphore.h: Move...
>> 	* sysdeps/unix/sysv/linux/aarch64/bits/semaphore.h: ... here.
> 
> These could go into sysdeps/aarch64/nptl/bits/ instead.

Presumably sysdeps/aarch64/bits/ without the nptl subdir.  Sure.
Ok with that change?


r~
Marcus Shawcroft June 5, 2014, 4:04 p.m. UTC | #3
On 05/06/14 17:01, Richard Henderson wrote:
> On 06/03/2014 11:05 AM, Roland McGrath wrote:
>> That looks adequate.  But...
>>
>>> 	* sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h: Move...
>>> 	* sysdeps/unix/sysv/linux/aarch64/bits/pthreadtypes.h: ... here.
>>> 	* sysdeps/unix/sysv/linux/aarch64/nptl/bits/semaphore.h: Move...
>>> 	* sysdeps/unix/sysv/linux/aarch64/bits/semaphore.h: ... here.
>>
>> These could go into sysdeps/aarch64/nptl/bits/ instead.
>
> Presumably sysdeps/aarch64/bits/ without the nptl subdir.  Sure.
> Ok with that change?
>
>
> r~
>
>

Ok with me.

/Marcus
Chris Metcalf June 5, 2014, 4:14 p.m. UTC | #4
On 6/5/2014 12:01 PM, Richard Henderson wrote:
> On 06/03/2014 11:05 AM, Roland McGrath wrote:
>> That looks adequate.  But...
>>
>>> 	* sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h: Move...
>>> 	* sysdeps/unix/sysv/linux/aarch64/bits/pthreadtypes.h: ... here.
>>> 	* sysdeps/unix/sysv/linux/aarch64/nptl/bits/semaphore.h: Move...
>>> 	* sysdeps/unix/sysv/linux/aarch64/bits/semaphore.h: ... here.
>> These could go into sysdeps/aarch64/nptl/bits/ instead.
> Presumably sysdeps/aarch64/bits/ without the nptl subdir.  Sure.

It looks like x86 and arm are already using sysdeps/ARCH/nptl/bits, so perhaps better to be consistent, though?

Unfortunately, powerpc and alpha already followed your original proposal of moving to sysdeps/unix/sysv/linux/ARCH/bits for these files.  Roland, do you think the powerpc/alpha maintainers should adjust those paths to be consistent with x86 and arm?

I'm waiting on this decision for precedent as to how to move the sysdeps/unix/sysv/linux/tile files (as presumably are the ia64, m68k, microblaze, mips, and hppa maintainers).  Two possible places to put these files is bad enough; we certainly don't want three.
Roland McGrath June 5, 2014, 6:33 p.m. UTC | #5
> > These could go into sysdeps/aarch64/nptl/bits/ instead.
> 
> Presumably sysdeps/aarch64/bits/ without the nptl subdir.  Sure.
> Ok with that change?

Nope.  With the subdir.
Roland McGrath June 5, 2014, 6:43 p.m. UTC | #6
> It looks like x86 and arm are already using sysdeps/ARCH/nptl/bits, so
> perhaps better to be consistent, though?

The nptl/ subdir is appropriate, because these files do not apply to any
non-nptl configuration that uses sysdeps/ARCH.  Today sysdeps/ARCH/nptl
gets into the list because of the add-on mechanism.  But later on, it will
still get there, because once nptl is no longer an add-on each
sysdeps/unix/sysv/linux/ARCH/Implies will list sysdeps/ARCH/nptl.

> Unfortunately, powerpc and alpha already followed your original proposal
> of moving to sysdeps/unix/sysv/linux/ARCH/bits for these files.  Roland,
> do you think the powerpc/alpha maintainers should adjust those paths to
> be consistent with x86 and arm?

Using sysdeps/unix/sysv/linux/ARCH/ here is an acceptable intermediate
step.  There are really two separate things going on here:

1. De-add-on-ization of NPTL.
   To do just this, using sysdeps/unix/sysv/linux/ARCH/ makes sense and
   is the least change from the status quo.
2. De-Linux-ization of NPTL code containing no actual Linuxisms.
   Assuming each bits/ file actually contains no Linuxisms, then
   using sysdeps/ARCH/nptl/ accomplishes one tiny piece of this work.

#1 is what requires action from every machine maintainer.  For #2 I'll be
able to proceed piecemeal with each architecture I'm actually paying
attention to for a non-Linux NPTL port, which is just ARM to begin with and
later will include x86.

So if you want to vet the bits/ files and verify there are no creeping
Linuxisms in there, then moving them to sysdeps/ARCH/nptl now is great.
But if you want to think about it less and just move them to
sysdeps/unix/sysv/linux/ARCH/, that is just fine too.


Thanks,
Roland
Chris Metcalf June 10, 2014, 6:15 p.m. UTC | #7
On 6/5/2014 2:43 PM, Roland McGrath wrote:
> Using sysdeps/unix/sysv/linux/ARCH/ here is an acceptable intermediate
> step.  There are really two separate things going on here:
>
> 1. De-add-on-ization of NPTL.
>     To do just this, using sysdeps/unix/sysv/linux/ARCH/ makes sense and
>     is the least change from the status quo.
> 2. De-Linux-ization of NPTL code containing no actual Linuxisms.
>     Assuming each bits/ file actually contains no Linuxisms, then
>     using sysdeps/ARCH/nptl/ accomplishes one tiny piece of this work.
>
> #1 is what requires action from every machine maintainer.  For #2 I'll be
> able to proceed piecemeal with each architecture I'm actually paying
> attention to for a non-Linux NPTL port, which is just ARM to begin with and
> later will include x86.
>
> So if you want to vet the bits/ files and verify there are no creeping
> Linuxisms in there, then moving them to sysdeps/ARCH/nptl now is great.
> But if you want to think about it less and just move them to
> sysdeps/unix/sysv/linux/ARCH/, that is just fine too.

I took option #2 since the tile headers were pretty similar to the existing x86.

Roland, my moving createthread.c will now mean you'll have a merge issue with your change to delete it in favor of the new #define in tls.h; sorry about that.

Patch
diff mbox

diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/bits/local_lim.h b/sysdeps/unix/sysv/linux/aarch64/bits/local_lim.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/bits/local_lim.h
rename to sysdeps/unix/sysv/linux/aarch64/bits/local_lim.h
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h b/sysdeps/unix/sysv/linux/aarch64/bits/pthreadtypes.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/bits/pthreadtypes.h
rename to sysdeps/unix/sysv/linux/aarch64/bits/pthreadtypes.h
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/bits/semaphore.h b/sysdeps/unix/sysv/linux/aarch64/bits/semaphore.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/bits/semaphore.h
rename to sysdeps/unix/sysv/linux/aarch64/bits/semaphore.h
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/c++-types.data b/sysdeps/unix/sysv/linux/aarch64/c++-types.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/c++-types.data
rename to sysdeps/unix/sysv/linux/aarch64/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/createthread.c b/sysdeps/unix/sysv/linux/aarch64/createthread.c
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/createthread.c
rename to sysdeps/unix/sysv/linux/aarch64/createthread.c
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/ld.abilist b/sysdeps/unix/sysv/linux/aarch64/ld.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/ld.abilist
rename to sysdeps/unix/sysv/linux/aarch64/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/aarch64/libBrokenLocale.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libBrokenLocale.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/libanl.abilist b/sysdeps/unix/sysv/linux/aarch64/libanl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libanl.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libc.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/libcrypt.abilist b/sysdeps/unix/sysv/linux/aarch64/libcrypt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libcrypt.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/libdl.abilist b/sysdeps/unix/sysv/linux/aarch64/libdl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libdl.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/libm.abilist b/sysdeps/unix/sysv/linux/aarch64/libm.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libm.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/libnsl.abilist b/sysdeps/unix/sysv/linux/aarch64/libnsl.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libnsl.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libpthread.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/libresolv.abilist b/sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libresolv.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/librt.abilist b/sysdeps/unix/sysv/linux/aarch64/librt.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/librt.abilist
rename to sysdeps/unix/sysv/linux/aarch64/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/libthread_db.abilist b/sysdeps/unix/sysv/linux/aarch64/libthread_db.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libthread_db.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/libutil.abilist b/sysdeps/unix/sysv/linux/aarch64/libutil.abilist
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/libutil.abilist
rename to sysdeps/unix/sysv/linux/aarch64/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/localplt.data b/sysdeps/unix/sysv/linux/aarch64/localplt.data
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/localplt.data
rename to sysdeps/unix/sysv/linux/aarch64/localplt.data
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/aarch64/lowlevellock.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h
rename to sysdeps/unix/sysv/linux/aarch64/lowlevellock.h
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
rename to sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h