[COMMITTED] Fix powerpc fork after i386 reorganization.
diff mbox

Message ID 20140514203018.A64A72C3A54@topped-with-meat.com
State New
Headers show

Commit Message

Roland McGrath May 14, 2014, 8:30 p.m. UTC
When I was fiddling with the i386 fork.[ch] I failed to notice the powerpc
dependency on the old file.  This should fix it, but is untested.

	* sysdeps/unix/sysv/linux/powerpc/fork.h: New file.
	* nptl/sysdeps/unix/sysv/linux/powerpc/fork.c: File removed.

Comments

Adhemerval Zanella May 14, 2014, 8:42 p.m. UTC | #1
On 14-05-2014 17:30, Roland McGrath wrote:
> When I was fiddling with the i386 fork.[ch] I failed to notice the powerpc
> dependency on the old file.  This should fix it, but is untested.
>
> 	* sysdeps/unix/sysv/linux/powerpc/fork.h: New file.
> 	* nptl/sysdeps/unix/sysv/linux/powerpc/fork.c: File removed.
>
> --- a/nptl/sysdeps/unix/sysv/linux/powerpc/fork.c
> +++ /dev/null
> @@ -1 +0,0 @@
> -#include "../i386/fork.c"
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/powerpc/fork.h
> @@ -0,0 +1 @@
> +#include <sysdeps/unix/sysv/linux/i386/fork.h>
>
Thanks for checking on this.  Now you have started this cleanup, I think it it
time to cleanup powerpc code as well.  I'll check on this.
Joseph Myers May 14, 2014, 9:05 p.m. UTC | #2
On Wed, 14 May 2014, Roland McGrath wrote:

> When I was fiddling with the i386 fork.[ch] I failed to notice the powerpc
> dependency on the old file.  This should fix it, but is untested.

MIPS is using it as well.
Roland McGrath May 14, 2014, 9:07 p.m. UTC | #3
> Thanks for checking on this.  Now you have started this cleanup, I think
> it it time to cleanup powerpc code as well.  I'll check on this.

I'd intended to get to the other machines eventually, though to leave the
testing to machine maintainers and get their approval before committing.
But if you want to do the legwork for powerpc, please do!

I think these are the steps you'll need to do to mirror what I've done for
x86_64 so far:

1. Merge vfork.S code; remove pt-vfork.S entirely.
2. Merge clone.S code.
3. Merge Makefile and Versions files.
4. Move bits/local_lim.h to sysdeps/unix/sysv/linux/
5. Move bits/{pthreadtypes,semaphore}.h to sysdeps/powerpc/nptl/.
6. Move everything else to sysdeps/unix/sysv/linux/


Thanks,
Roland
Joseph Myers May 14, 2014, 9:11 p.m. UTC | #4
On Wed, 14 May 2014, Roland McGrath wrote:

> 6. Move everything else to sysdeps/unix/sysv/linux/

There's at least one piece done for ARM but missing for x86_64: moving the 
ABI baselines from sysdeps/unix/sysv/linux/x86_64/{64,x32}/nptl out of the 
nptl subdirectory.
Roland McGrath May 14, 2014, 10:31 p.m. UTC | #5
> There's at least one piece done for ARM but missing for x86_64: moving the 
> ABI baselines from sysdeps/unix/sysv/linux/x86_64/{64,x32}/nptl out of the 
> nptl subdirectory.

Yes, I have not finished x86 yet.
Steve Ellcey May 16, 2014, 3:09 p.m. UTC | #6
On Wed, 2014-05-14 at 21:05 +0000, Joseph S. Myers wrote:
> On Wed, 14 May 2014, Roland McGrath wrote:
> 
> > When I was fiddling with the i386 fork.[ch] I failed to notice the powerpc
> > dependency on the old file.  This should fix it, but is untested.
> 
> MIPS is using it as well.

Roland,

It looks like you changed this for MIPS but my build is still failing:



In file included from ../sysdeps/unix/sysv/linux/mips/fork.h:1:0,
                 from cxa_finalize.c:22:
../sysdeps/unix/sysv/linux/i386/fork.h:27:23: fatal error: fork.h: No such file or directory
 #include_next <fork.h>
                       ^
compilation terminated.


I am not sure what fork.h the include_next should be finding.

Steve Ellcey
sellcey@mips.com

Patch
diff mbox

--- a/nptl/sysdeps/unix/sysv/linux/powerpc/fork.c
+++ /dev/null
@@ -1 +0,0 @@ 
-#include "../i386/fork.c"
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/fork.h
@@ -0,0 +1 @@ 
+#include <sysdeps/unix/sysv/linux/i386/fork.h>