AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 10:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* elf/readlib.c: Include a.out.h last since the Linux/Alpha
	headers are not clean enough.
This commit is contained in:
Ulrich Drepper 1999-12-09 01:39:16 +00:00
parent d587d83bd9
commit af1680f1f9
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
1999-12-08 Ulrich Drepper <drepper@cygnus.com> 1999-12-08 Ulrich Drepper <drepper@cygnus.com>
* elf/readlib.c: Include a.out.h last since the Linux/Alpha
headers are not clean enough.
* sysdeps/unix/sysv/linux/getrlimit.c: Remove K&R compatibility. * sysdeps/unix/sysv/linux/getrlimit.c: Remove K&R compatibility.
* sysdeps/unix/sysv/linux/kernel-features.h: Define * sysdeps/unix/sysv/linux/kernel-features.h: Define

7
elf/readlib.c
View File

@ -24,7 +24,6 @@
modified to read some other file formats. */ modified to read some other file formats. */
#include <a.out.h>
#include <elf.h> #include <elf.h>
#include <error.h> #include <error.h>
#include <link.h> #include <link.h>
@ -32,6 +31,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <a.out.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -71,7 +71,7 @@ process_file (const char *file_name, const char *lib, int *flag, char **soname,
struct stat statbuf; struct stat statbuf;
void *file_contents; void *file_contents;
int ret; int ret;
ElfW(Ehdr) *elf_header; ElfW(Ehdr) *elf_header;
struct exec *aout_header; struct exec *aout_header;
@ -123,7 +123,7 @@ process_file (const char *file_name, const char *lib, int *flag, char **soname,
*flag = FLAG_LIBC4; *flag = FLAG_LIBC4;
goto done; goto done;
} }
elf_header = (ElfW(Ehdr) *) file_contents; elf_header = (ElfW(Ehdr) *) file_contents;
if (elf_header->e_ident [EI_MAG0] != ELFMAG0 if (elf_header->e_ident [EI_MAG0] != ELFMAG0
|| elf_header->e_ident [EI_MAG1] != ELFMAG1 || elf_header->e_ident [EI_MAG1] != ELFMAG1
@ -157,4 +157,3 @@ process_file (const char *file_name, const char *lib, int *flag, char **soname,
/* Get architecture specific version of process_elf_file. */ /* Get architecture specific version of process_elf_file. */
#include "readelflib.c" #include "readelflib.c"

5
sysdeps/unix/sysv/linux/ftruncate64.c
View File

@ -41,8 +41,9 @@ ftruncate64 (fd, length)
if (! have_no_ftruncate64) if (! have_no_ftruncate64)
#endif #endif
{ {
int result = INLINE_SYSCALL (ftruncate64, 3, fd, length >> 32, unsigned int low = length & 0xffffffff;
length & 0xffffffff); unsigned int high = length >> 32;
int result = INLINE_SYSCALL (ftruncate64, 3, fd, low, high);
#ifndef __ASSUME_TRUNCATE64_SYSCALL #ifndef __ASSUME_TRUNCATE64_SYSCALL
if (result != -1 || errno != ENOSYS) if (result != -1 || errno != ENOSYS)

12
sysdeps/unix/sysv/linux/i386/mmap64.S
View File

@ -21,6 +21,7 @@
#include "kernel-features.h" #include "kernel-features.h"
#define EINVAL 22 #define EINVAL 22
#define ENOSYS 38
.text .text
@ -36,11 +37,12 @@ ENTRY (__mmap64)
movl $SYS_ify(mmap2), %eax /* System call number in %eax. */ movl $SYS_ify(mmap2), %eax /* System call number in %eax. */
movl 40(%esp), %ebp movl 40(%esp), %edx
movl 44(%esp), %ecx movl 44(%esp), %ecx
shrld $12, %ecx, %ebp /* mmap2 takes the offset in pages. */ shrdl $12, %ecx, %edx /* mmap2 takes the offset in pages. */
shrl $12, %ecx shrl $12, %ecx
jne L(einval) jne L(einval)
movl %edx, %ebp
movl 20(%esp), %ebx movl 20(%esp), %ebx
movl 24(%esp), %ecx movl 24(%esp), %ecx
@ -68,8 +70,8 @@ L(pseudo_end):
#ifndef __ASSUME_MMAP2_SYSCALL #ifndef __ASSUME_MMAP2_SYSCALL
2: 2:
cmp $-EINVAL, %eax cmp $-ENOSYS, %eax
je 2f je 3f
#endif #endif
/* This means the offset value is too large. */ /* This means the offset value is too large. */
@ -88,7 +90,7 @@ L(einval):
/* Save registers. */ /* Save registers. */
movl %ebx, %edx movl %ebx, %edx
# endif # endif
3:
cmpl $0, 44(%esp) cmpl $0, 44(%esp)
jne L(einval) jne L(einval)

5
sysdeps/unix/sysv/linux/truncate64.c
View File

@ -41,8 +41,9 @@ truncate64 (path, length)
if (! have_no_truncate64) if (! have_no_truncate64)
#endif #endif
{ {
int result = INLINE_SYSCALL (truncate64, 3, path, length >> 32, unsigned int low = length & 0xffffffff;
length & 0xffffffff); unsigned int high = length >> 32;
int result = INLINE_SYSCALL (truncate64, 3, path, low, high);
#ifndef __ASSUME_TRUNCATE64_SYSCALL #ifndef __ASSUME_TRUNCATE64_SYSCALL
if (result != -1 || errno != ENOSYS) if (result != -1 || errno != ENOSYS)