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/ioperm.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libc/sysdeps/linux/arm/ioperm.c') diff --git a/libc/sysdeps/linux/arm/ioperm.c b/libc/sysdeps/linux/arm/ioperm.c index a7f6c3067..0e283cbac 100644 --- a/libc/sysdeps/linux/arm/ioperm.c +++ b/libc/sysdeps/linux/arm/ioperm.c @@ -50,6 +50,8 @@ #include +#ifdef __NR_ioperm + #define PATH_ARM_SYSTYPE "/etc/arm_systype" #define PATH_CPUINFO "/proc/cpuinfo" @@ -244,3 +246,5 @@ inl(unsigned long int port) { return *((__volatile__ unsigned long *)(IO_ADDR (port))); } + +#endif -- cgit v1.2.3