[5/5] PowerPC: Move remaining, nptl/sysdeps/unix/sysv/linux/powerpc/ files.
diff mbox

Message ID 53826F20.4050303@linux.vnet.ibm.com
State New
Headers show

Commit Message

Adhemerval Zanella May 25, 2014, 10:30 p.m. UTC
On 23-05-2014 19:06, Roland McGrath wrote:
> When you are posting a change that is largely verbatim file moves, and
> especially if you aren't expecting people to apply the patch themselves
> with 'patch' (because you supplied a git branch, or because you advise
> people they'll have to use 'git apply'), using 'git diff --renames' makes
> the diff a lot easier to review.

Thanks for tip, I'll use later.

>
>> 	* nptl/sysdeps/unix/sysv/linux/powerpc/Makefile: Moved ...
>> 	* sysdeps/unix/sysv/linux/powerpc/nptl/Makefile: ... here.
> Not helpful.  At the end of the day, there should not be a
> sysdeps/unix/sysv/linux/powerpc/nptl/ subdirectory at all.  You need to
> merge the nptl/.../Makefile contents into the existing
> sysdeps/unix/sysv/linux/powerpc/Makefile instead.  Note that they
> really should have an 'ifeq ($(subdir),nptl)' conditional that the
> old Makefile was missing.

Indeed, thanks for spotting it. I'll update the patch with this modification
to remove sysdep/.../nptl/Makefile


> The rest looks fine off hand.
>
>
> Thanks,
> Roland
>

Patch
diff mbox

diff --git a/sysdeps/unix/sysv/linux/powerpc/Makefile b/sysdeps/unix/sysv/linux/powerpc/Makefile
index 395342f..28f7165 100644
--- a/sysdeps/unix/sysv/linux/powerpc/Makefile
+++ b/sysdeps/unix/sysv/linux/powerpc/Makefile
@@ -31,3 +31,7 @@  sysdep_headers += bits/ppc.h
 sysdep_routines += get_timebase_freq
 tests += test-gettimebasefreq
 endif
+
+ifeq ($(subdir),nptl)
+libpthread-routines += sysdep
+endif
diff --git a/sysdeps/unix/sysv/linux/powerpc/nptl/Makefile b/sysdeps/unix/sysv/linux/powerpc/nptl/Makefile
deleted file mode 100644
index e98c9bd..0000000
--- a/sysdeps/unix/sysv/linux/powerpc/nptl/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@ 
-# pull in __syscall_error routine
-libpthread-routines += sysdep