Skip to contentSkip to conversation

pread.h: Remove support for libc5

PATCH Applied Felix Janda 2 participants 2 messages Mar 29, 2015 – Apr 9, 2015

Subsystems (2)
PCI Library code
lore
Share & tools
lore

Felix Janda

author
#0 lore raw

PATCH 1/1 pread.h: Remove support for libc5

The support code for libc5 breaks building on linux i386 with other libcs that don't define __GLIBC__.

---
 lib/pread.h | 9 ---------
 1 file changed, 9 deletions(-)
lib/pread.h +0 -9
index 0e64326..3db90e3 100644
@@ -30,15 +30,6 @@ static int pread(unsigned int fd, void *buf, size_t size, loff_t where)
 static int pwrite(unsigned int fd, void *buf, size_t size, loff_t where)
 { return syscall(SYS_pwrite, fd, buf, size, where); }
 
-#elif defined(i386)
-/* old libc on i386 -> call syscalls directly the old way */
-#include <asm/unistd.h>
-static _syscall5(int, pread, unsigned int, fd, void *, buf, size_t, size, u32, where_lo, u32, where_hi);
-static _syscall5(int, pwrite, unsigned int, fd, void *, buf, size_t, size, u32, where_lo, u32, where_hi);
-static int do_read(struct pci_dev *d UNUSED, int fd, void *buf, size_t size, int where) { return pread(fd, buf, size, where, 0); }
-static int do_write(struct pci_dev *d UNUSED, int fd, void *buf, size_t size, int where) { return pwrite(fd, buf, size, where, 0); }
-#define PCI_HAVE_DO_READ
-
 #else
 /* In all other cases we use lseek/read/write instead to be safe */
 #define make_rw_glue(op) \
Signature · 1 line
2.0.5
Applied
#1 lore raw

Hi!

Quoted 2 lines

The support code for libc5 breaks building on linux i386 with other libcs that don't define __GLIBC__.

Thanks, applied. I will release pciutils-3.3.1 in a couple of minutes.

Have a nice fortnight

Signature · 3 lines
Martin `MJ' Mares                          <[email protected]>   http://mj.ucw.cz/
Faculty of Math and Physics, Charles University, Prague, Czech Rep., Earth
Immanuel doesn't pun, he Kant.