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/kernel-features.h: Define
modified to read some other file formats. */
-#include <a.out.h>
#include <elf.h>
#include <error.h>
#include <link.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
+#include <a.out.h>
#include <sys/mman.h>
#include <sys/stat.h>
struct stat statbuf;
void *file_contents;
int ret;
-
+
ElfW(Ehdr) *elf_header;
struct exec *aout_header;
*flag = FLAG_LIBC4;
goto done;
}
-
+
elf_header = (ElfW(Ehdr) *) file_contents;
if (elf_header->e_ident [EI_MAG0] != ELFMAG0
|| elf_header->e_ident [EI_MAG1] != ELFMAG1
/* Get architecture specific version of process_elf_file. */
#include "readelflib.c"
-
if (! have_no_ftruncate64)
#endif
{
- int result = INLINE_SYSCALL (ftruncate64, 3, fd, length >> 32,
- length & 0xffffffff);
+ unsigned int low = length & 0xffffffff;
+ unsigned int high = length >> 32;
+ int result = INLINE_SYSCALL (ftruncate64, 3, fd, low, high);
#ifndef __ASSUME_TRUNCATE64_SYSCALL
if (result != -1 || errno != ENOSYS)
#include "kernel-features.h"
#define EINVAL 22
+#define ENOSYS 38
.text
movl $SYS_ify(mmap2), %eax /* System call number in %eax. */
- movl 40(%esp), %ebp
+ movl 40(%esp), %edx
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
jne L(einval)
+ movl %edx, %ebp
movl 20(%esp), %ebx
movl 24(%esp), %ecx
#ifndef __ASSUME_MMAP2_SYSCALL
2:
- cmp $-EINVAL, %eax
- je 2f
+ cmp $-ENOSYS, %eax
+ je 3f
#endif
/* This means the offset value is too large. */
/* Save registers. */
movl %ebx, %edx
# endif
-
+3:
cmpl $0, 44(%esp)
jne L(einval)
if (! have_no_truncate64)
#endif
{
- int result = INLINE_SYSCALL (truncate64, 3, path, length >> 32,
- length & 0xffffffff);
+ unsigned int low = length & 0xffffffff;
+ unsigned int high = length >> 32;
+ int result = INLINE_SYSCALL (truncate64, 3, path, low, high);
#ifndef __ASSUME_TRUNCATE64_SYSCALL
if (result != -1 || errno != ENOSYS)