diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-11-19 20:05:14 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-11-19 20:05:14 +0000 |
| commit | 8e8c8d3c871666d3c4fb0cda0147fb2231beeb09 (patch) | |
| tree | 8205dc9da58d4c3090372b155fdede74e7b3d6b1 /sysdeps/unix/sysv/linux/powerpc | |
| parent | b9616a4d2d0ff113b95a638127ad27c98e6c713b (diff) | |
Updated to fedora-glibc-20051119T1959
Diffstat (limited to 'sysdeps/unix/sysv/linux/powerpc')
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/bits/shm.h | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S | 12 |
3 files changed, 17 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h b/sysdeps/unix/sysv/linux/powerpc/bits/shm.h index 7705fb64d4..62560c0caf 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/shm.h @@ -80,9 +80,10 @@ struct shmid_ds # define SHM_INFO 14 /* shm_mode upper byte flags */ -# define SHM_DEST 01000 /* segment will be destroyed on last detach */ -# define SHM_LOCKED 02000 /* segment will not be swapped */ +# define SHM_DEST 01000 /* segment will be destroyed on last detach */ +# define SHM_LOCKED 02000 /* segment will not be swapped */ # define SHM_HUGETLB 04000 /* segment is mapped via hugetlb */ +# define SHM_NORESERVE 010000 /* don't check for reservations */ struct shminfo { diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S index 72170c95c0..3e4a188a20 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S @@ -44,7 +44,11 @@ #define stackblock 20 #ifndef __socket -#define __socket P(__,socket) +# ifndef NO_WEAK_ALIAS +# define __socket P(__,socket) +# else +# define __socket socket +# endif #endif .text @@ -114,4 +118,6 @@ ENTRY(__socket) PSEUDO_END (__socket) +#ifndef NO_WEAK_ALIAS weak_alias (__socket, socket) +#endif diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S index ec3ab5d9e6..a73f7be666 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S @@ -41,12 +41,12 @@ #define stackblock 80 /* offset to socket parm area. */ -#ifndef socket -/* If this is just socket.S leave it alone! */ -#else #ifndef __socket -#define __socket P(__,socket) -#endif +# ifndef NO_WEAK_ALIAS +# define __socket P(__,socket) +# else +# define __socket socket +# endif #endif .text @@ -120,4 +120,6 @@ ENTRY(__socket) cfi_endproc PSEUDO_END (__socket) +#ifndef NO_WEAK_ALIAS weak_alias (__socket, socket) +#endif |