yann@1: Applies to both glibc-2.2.5 and glibc-2.3.2, and probably glibc cvs as of Aug 2004. yann@1: Needed to build glibc with linux kernels 2.4.23 or higher on ARM, yann@1: Fixes following error: yann@1: yann@1: ../sysdeps/unix/sysv/linux/arm/ioperm.c: In function `init_iosys': yann@1: ../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: `BUS_ISA' undeclared (first use in this function) yann@1: ../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: (Each undeclared identifier is reported only once yann@1: ../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: for each function it appears in.) yann@1: ../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: initializer element is not constant yann@1: ../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: (near initialization for `iobase_name[1]') yann@1: ../sysdeps/unix/sysv/linux/arm/ioperm.c:104: error: initializer element is not constant yann@1: ../sysdeps/unix/sysv/linux/arm/ioperm.c:104: error: (near initialization for `ioshift_name[1]') yann@1: make[2]: *** [/home/dank/crosstool-0.28/build/arm-softfloat-linux-gnu/gcc-3.3.4-glibc-2.2.5/build-glibc/misc/ioperm.o] Error 1 yann@1: yann@1: cf. "[SYSCTL] BUS_ISA -> CTL_BUS_ISA", http://www.ussg.iu.edu/hypermail/linux/kernel/0311.0/0529.html yann@1: yann@1: --- glibc-2.3.2/sysdeps/unix/sysv/linux/arm/ioperm.c.old 2003-02-20 14:22:24.000000000 -0800 yann@1: +++ glibc-2.3.2/sysdeps/unix/sysv/linux/arm/ioperm.c 2004-01-31 16:01:50.000000000 -0800 yann@1: @@ -47,6 +47,12 @@ yann@1: #include yann@1: #include yann@1: yann@1: +/* see http://www.ussg.iu.edu/hypermail/linux/kernel/0311.0/0529.html */ yann@1: +#include yann@1: +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)) yann@1: +#define CTL_BUS_ISA BUS_ISA /* and hope it's not the one from linux/input.h */ yann@1: +#endif yann@1: + yann@1: #define PATH_ARM_SYSTYPE "/etc/arm_systype" yann@1: #define PATH_CPUINFO "/proc/cpuinfo" yann@1: yann@1: @@ -80,7 +86,7 @@ yann@1: * Initialize I/O system. There are several ways to get the information yann@1: * we need. Each is tried in turn until one succeeds. yann@1: * yann@1: - * 1. Sysctl (CTL_BUS, BUS_ISA, ISA_*). This is the preferred method yann@1: + * 1. Sysctl (CTL_BUS, CTL_BUS_ISA, ISA_*). This is the preferred method yann@1: * but not all kernels support it. yann@1: * yann@1: * 2. Read the value (not the contents) of symlink PATH_ARM_SYSTYPE. yann@1: @@ -100,8 +106,8 @@ yann@1: { yann@1: char systype[256]; yann@1: int i, n; yann@1: - static int iobase_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_BASE }; yann@1: - static int ioshift_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_SHIFT }; yann@1: + static int iobase_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_BASE }; yann@1: + static int ioshift_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_SHIFT }; yann@1: size_t len = sizeof(io.base); yann@1: yann@1: if (! sysctl (iobase_name, 3, &io.io_base, &len, NULL, 0)