diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-06-25 10:04:14 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-06-25 10:04:14 -0700 |
| commit | 74836003ed4f2613f5c47a654bdd38a366076c15 (patch) | |
| tree | fc50e17ba0787b3a59baf4a81cd75bb26351ba4b /sysdeps/sparc/sparc64 | |
| parent | 06d50baa341a6bc603d4228128aff92483b98708 (diff) | |
| download | glibc-74836003ed4f2613f5c47a654bdd38a366076c15.tar.gz | |
SPARC: Consolidate unnecessary nptl/ subdirectories.
Diffstat (limited to 'sysdeps/sparc/sparc64')
| -rw-r--r-- | sysdeps/sparc/sparc64/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/cpu_relax.S (renamed from sysdeps/sparc/sparc64/nptl/cpu_relax.S) | 0 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/nptl/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/pthread_spin_init.c (renamed from sysdeps/sparc/sparc64/nptl/pthread_spin_init.c) | 0 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/pthread_spin_lock.S (renamed from sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S) | 0 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/pthread_spin_trylock.S (renamed from sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S) | 0 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/pthread_spin_unlock.S (renamed from sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S) | 0 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/pthreaddef.h (renamed from sysdeps/sparc/sparc64/nptl/pthreaddef.h) | 0 |
8 files changed, 4 insertions, 3 deletions
diff --git a/sysdeps/sparc/sparc64/Makefile b/sysdeps/sparc/sparc64/Makefile index fb161ea13f..dd3023dcec 100644 --- a/sysdeps/sparc/sparc64/Makefile +++ b/sysdeps/sparc/sparc64/Makefile @@ -14,3 +14,7 @@ ASFLAGS-.op += -Wa,-Av9d ASFLAGS-.og += -Wa,-Av9d ASFLAGS-.oS += -Wa,-Av9d endif + +ifeq ($(subdir),nptl) +libpthread-routines += cpu_relax +endif diff --git a/sysdeps/sparc/sparc64/nptl/cpu_relax.S b/sysdeps/sparc/sparc64/cpu_relax.S index 9d45eb7e42..9d45eb7e42 100644 --- a/sysdeps/sparc/sparc64/nptl/cpu_relax.S +++ b/sysdeps/sparc/sparc64/cpu_relax.S diff --git a/sysdeps/sparc/sparc64/nptl/Makefile b/sysdeps/sparc/sparc64/nptl/Makefile deleted file mode 100644 index ddc9038611..0000000000 --- a/sysdeps/sparc/sparc64/nptl/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(subdir),nptl) -libpthread-routines += cpu_relax -endif diff --git a/sysdeps/sparc/sparc64/nptl/pthread_spin_init.c b/sysdeps/sparc/sparc64/pthread_spin_init.c index 58319ab62d..58319ab62d 100644 --- a/sysdeps/sparc/sparc64/nptl/pthread_spin_init.c +++ b/sysdeps/sparc/sparc64/pthread_spin_init.c diff --git a/sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S b/sysdeps/sparc/sparc64/pthread_spin_lock.S index aec66542de..aec66542de 100644 --- a/sysdeps/sparc/sparc64/nptl/pthread_spin_lock.S +++ b/sysdeps/sparc/sparc64/pthread_spin_lock.S diff --git a/sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S b/sysdeps/sparc/sparc64/pthread_spin_trylock.S index d10b08b5da..d10b08b5da 100644 --- a/sysdeps/sparc/sparc64/nptl/pthread_spin_trylock.S +++ b/sysdeps/sparc/sparc64/pthread_spin_trylock.S diff --git a/sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S b/sysdeps/sparc/sparc64/pthread_spin_unlock.S index 0c18530735..0c18530735 100644 --- a/sysdeps/sparc/sparc64/nptl/pthread_spin_unlock.S +++ b/sysdeps/sparc/sparc64/pthread_spin_unlock.S diff --git a/sysdeps/sparc/sparc64/nptl/pthreaddef.h b/sysdeps/sparc/sparc64/pthreaddef.h index ee44bcf1af..ee44bcf1af 100644 --- a/sysdeps/sparc/sparc64/nptl/pthreaddef.h +++ b/sysdeps/sparc/sparc64/pthreaddef.h |