[PATCH] Sparc fixes

[Jakub Jelinek]

Hi!

This removes some warnings and fixes a typo in spinlock.h which prevents
building glibc on sparc32.

2000-07-06  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Pass 0
	instead of NULL to elf_machine_fixup_plt t argument.
	* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c (__mmap64): Add
	cast.

linuxthreads/
	* spinlock.h (__pthread_trylock): Fix typos.

--- libc/linuxthreads/spinlock.h.jj	Thu Jul  6 16:47:05 2000
+++ libc/linuxthreads/spinlock.h	Thu Jul  6 16:29:45 2000
@@ -107,7 +107,7 @@ static inline int __pthread_trylock (str
 #endif
 #if !defined HAS_COMPARE_AND_SWAP
   {
-    return (testandset(&lock->__spinlock) : EBUSY : 0)
+    return (testandset(&lock->__spinlock) ? EBUSY : 0);
   }
 #endif
 
--- libc/sysdeps/sparc/sparc32/dl-machine.h.jj	Thu Jul  6 16:17:26 2000
+++ libc/sysdeps/sparc/sparc32/dl-machine.h	Thu Jul  6 16:17:56 2000
@@ -396,7 +396,7 @@ elf_machine_rela (struct link_map *map, 
 	  *reloc_addr = value;
 	  break;
 	case R_SPARC_JMP_SLOT:
-	  elf_machine_fixup_plt(map, NULL, reloc, reloc_addr, value);
+	  elf_machine_fixup_plt(map, 0, reloc, reloc_addr, value);
 	  break;
 	case R_SPARC_8:
 	  *(char *) reloc_addr = value;
--- libc/sysdeps/sparc/sparc64/dl-machine.h.jj	Sat May 13 16:56:21 2000
+++ libc/sysdeps/sparc/sparc64/dl-machine.h	Thu Jul  6 16:18:53 2000
@@ -313,7 +313,7 @@ elf_machine_rela (struct link_map *map, 
 	  break;
 
 	case R_SPARC_JMP_SLOT:
-	  elf_machine_fixup_plt(map, NULL, reloc, reloc_addr, value);
+	  elf_machine_fixup_plt(map, 0, reloc, reloc_addr, value);
 	  break;
 
 	case R_SPARC_UA64:
--- libc/sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c.jj	Wed Mar 22 16:36:11 2000
+++ libc/sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c	Thu Jul  6 16:45:18 2000
@@ -48,8 +48,9 @@ __mmap64 (__ptr_t addr, size_t len, int 
       int saved_errno = errno;
 #endif
       /* This will be always 12, no matter what page size is.  */
-      __ptr_t result = INLINE_SYSCALL (mmap2, 6, addr, len, prot, flags,
-				       fd, (off_t) (offset >> 12));
+      __ptr_t result =
+	(__ptr_t) INLINE_SYSCALL (mmap2, 6, addr, len, prot, flags,
+				  fd, (off_t) (offset >> 12));
 
 #ifndef __ASSUME_MMAP2_SYSCALL
       if (result != (__ptr_t) -1 || errno != ENOSYS)

	Jakub