diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-08-30 23:25:18 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-08-30 23:25:18 +0000 |
| commit | 90d40ab5d4d4acd924efa49d577467947bdf95e5 (patch) | |
| tree | 50a11c6d840121e4a87a097c7325a99319b74930 | |
| parent | 5a3fba993001f71d2c50a1ea59dcc75a721b7ccd (diff) | |
| download | glibc-90d40ab5d4d4acd924efa49d577467947bdf95e5.tar.gz glibc-90d40ab5d4d4acd924efa49d577467947bdf95e5.tar.xz glibc-90d40ab5d4d4acd924efa49d577467947bdf95e5.zip | |
Update.
* sysdeps/unix/sysv/linux/ia64/ioperm.c (_ioperm): Use __open instead of open, __close instead of close, __getpagesize instead of getpagesize. R_ALPHA_RELATIVE if RTLD_BOOTSTRAP and HAVE_Z_COMBRELOC. Only check for rtld map if neither RTLD_BOOTSTRAP nor HAVE_Z_COMBRELOC is defined.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/ioperm.c | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 2e206aba55..65071a4ab5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2001-08-30 Ulrich Drepper <drepper@redhat.com> + * sysdeps/unix/sysv/linux/ia64/ioperm.c (_ioperm): Use __open + instead of open, __close instead of close, __getpagesize instead + of getpagesize. + * string/argz-stringify.c (__argz_stringify): Use __strnlen instead of strnlen. * include/string.h (strndupa): Redefine here to use __strnlen @@ -12,8 +16,8 @@ 2001-08-30 Jakub Jelinek <jakub@redhat.com> * sysdeps/alpha/dl-machine.h (elf_machine_rela): Don't handle - R_ALPHA_RELATIVE if RTLD_BOOTSTRAP and HAVE_Z_COMBRELOC. Only - check for rtld map if RTLD_BOOTSTRAP nor HAVE_Z_COMBRELOC is defined. + R_ALPHA_RELATIVE if RTLD_BOOTSTRAP and HAVE_Z_COMBRELOC. Only check + for rtld map if neither RTLD_BOOTSTRAP nor HAVE_Z_COMBRELOC is defined. * sysdeps/i386/dl-machine.h (elf_machine_rel): Similarly. * sysdeps/ia64/dl-machine.h (elf_machine_rel): Similarly. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rel): Similarly. diff --git a/sysdeps/unix/sysv/linux/ia64/ioperm.c b/sysdeps/unix/sysv/linux/ia64/ioperm.c index c4494763d9..062ed2eb3e 100644 --- a/sysdeps/unix/sysv/linux/ia64/ioperm.c +++ b/sysdeps/unix/sysv/linux/ia64/ioperm.c @@ -1,6 +1,6 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by David Mosberger-Tang <davidm@hpl.hp.com>. + Contributed by David Mosberger-Tang <davidm@hpl.hp.com>. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -80,14 +80,14 @@ _ioperm (unsigned long int from, unsigned long int num, int turn_on) unsigned long phys_io_base, len; int fd; - io.page_mask = ~(getpagesize() - 1); + io.page_mask = ~(__getpagesize() - 1); /* get I/O base physical address from ar.k0 as per PRM: */ __asm__ ("mov %0=ar.k0" : "=r"(phys_io_base)); /* The O_SYNC flag tells the /dev/mem driver to map the memory uncached: */ - fd = open ("/dev/mem", O_RDWR | O_SYNC); + fd = __open ("/dev/mem", O_RDWR | O_SYNC); if (fd < 0) return -1; @@ -100,7 +100,7 @@ _ioperm (unsigned long int from, unsigned long int num, int turn_on) base = (unsigned long int) __mmap (0, len, PROT_NONE, MAP_SHARED, fd, phys_io_base); #endif - close (fd); + __close (fd); if ((long) base == -1) return -1; |