[PATCH] Fix glibc sparc build (dl-*brk stuff)

[Jakub Jelinek]

On Sun, Jun 09, 2002 at 09:56:09PM +0200, Andreas Jaeger wrote:
> > 2002-06-09  Jakub Jelinek  <jakub@redhat.com>
> >
> > 	* sysdeps/unix/sysv/linux/i386/dl-brk.c: Move...
> > 	* sysdeps/unix/sysv/linux/dl-brk.c: ...here.
> 
> The two lines above and below are the same - as is in your patch.

No, the lines above are dl-brk.c, the lines below are dl-sbrk.c.
Likewise in the patch. I only screwed up postprocessing of the patch, so
there are no spaces between --- resp. +++ and libc.

> 
> > 	* sysdeps/unix/sysv/linux/i386/dl-sbrk.c: Move...
> > 	* sysdeps/unix/sysv/linux/dl-sbrk.c: ...here.
> 
> Can you send a clean one, please?

Here is the patch after s/+++/ &/;s/---/ &/ :

2002-06-09  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/i386/dl-brk.c: Move...
	* sysdeps/unix/sysv/linux/dl-brk.c: ...here.
	* sysdeps/unix/sysv/linux/i386/dl-sbrk.c: Move...
	* sysdeps/unix/sysv/linux/dl-sbrk.c: ...here.

--- libc/sysdeps/unix/sysv/linux/i386/dl-brk.c.jj	Sun Apr  7 17:54:40 2002
+++ libc/sysdeps/unix/sysv/linux/i386/dl-brk.c	Sun Jun  9 21:19:10 2002
@@ -1,5 +0,0 @@
-/* We can use the normal code but we also know the __curbrk is not exported
-   from ld.so.  */
-extern void *__curbrk attribute_hidden;
-
-#include <brk.c>
--- libc/sysdeps/unix/sysv/linux/i386/dl-sbrk.c.jj	Sun Apr  7 17:54:40 2002
+++ libc/sysdeps/unix/sysv/linux/i386/dl-sbrk.c	Sun Jun  9 21:19:10 2002
@@ -1,5 +0,0 @@
-/* We can use the normal code but we also know the __curbrk is not exported
-   from ld.so.  */
-extern void *__curbrk attribute_hidden;
-
-#include <sbrk.c>
--- libc/sysdeps/unix/sysv/linux/dl-brk.c.jj	Sun Jun  9 21:19:23 2002
+++ libc/sysdeps/unix/sysv/linux/dl-brk.c	Sun Apr  7 17:54:40 2002
@@ -0,0 +1,5 @@
+/* We can use the normal code but we also know the __curbrk is not exported
+   from ld.so.  */
+extern void *__curbrk attribute_hidden;
+
+#include <brk.c>
--- libc/sysdeps/unix/sysv/linux/dl-sbrk.c.jj	Sun Jun  9 21:19:23 2002
+++ libc/sysdeps/unix/sysv/linux/dl-sbrk.c	Sun Apr  7 17:54:40 2002
@@ -0,0 +1,5 @@
+/* We can use the normal code but we also know the __curbrk is not exported
+   from ld.so.  */
+extern void *__curbrk attribute_hidden;
+
+#include <sbrk.c>

	Jakub