From 3bcd031f97d61a8f732d865a0f4248aed2d191ab Mon Sep 17 00:00:00 2001 From: Jason Woodward Date: Tue, 7 Feb 2012 19:07:57 -0500 Subject: Fix redefinition of ioperm and iopl in stubs.c and arm/{ioperm.c,iopl.c} This fixes the following link failure: LD libuClibc-0.9.33.so libc/libc_so.a(stubs.os): In function `sync_file_range': stubs.c:(.text+0x0): multiple definition of `ioperm' libc/libc_so.a(ioperm.os):ioperm.c:(.text+0x260): first defined here libc/libc_so.a(stubs.os): In function `sync_file_range': stubs.c:(.text+0x0): multiple definition of `iopl' libc/libc_so.a(iopl.os):iopl.c:(.text+0x0): first defined here collect2: ld returned 1 exit status make[1]: *** [lib/libc.so] Error 1 Signed-off-by: Jason Woodward Signed-off-by: Bernhard Reutner-Fischer --- libc/sysdeps/linux/arm/iopl.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libc/sysdeps/linux/arm/iopl.c') diff --git a/libc/sysdeps/linux/arm/iopl.c b/libc/sysdeps/linux/arm/iopl.c index df953d3c8..f3d42edb5 100644 --- a/libc/sysdeps/linux/arm/iopl.c +++ b/libc/sysdeps/linux/arm/iopl.c @@ -22,6 +22,8 @@ #include +#ifdef __NR_iopl + #define MAX_PORT 0x10000 int iopl(int level) @@ -34,3 +36,5 @@ int iopl(int level) return ioperm(0, MAX_PORT, 1); return 0; } + +#endif -- cgit v1.2.3