| [617118d] | 1 | Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
|
|---|
| 2 | Source: Dan Kegel's crosstool ( http://kegel.com/crosstool )
|
|---|
| 3 | Initial Package Version: See Below
|
|---|
| 4 |
|
|---|
| 5 | Applies to both glibc-2.2.5 and glibc-2.3.2, and probably glibc cvs as of Aug 2004.
|
|---|
| 6 | Needed to build glibc with linux kernels 2.4.23 or higher on ARM,
|
|---|
| 7 | Fixes following error:
|
|---|
| 8 |
|
|---|
| 9 | ../sysdeps/unix/sysv/linux/arm/ioperm.c: In function `init_iosys':
|
|---|
| 10 | ../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: `BUS_ISA' undeclared (first use in this function)
|
|---|
| 11 | ../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: (Each undeclared identifier is reported only once
|
|---|
| 12 | ../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: for each function it appears in.)
|
|---|
| 13 | ../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: initializer element is not constant
|
|---|
| 14 | ../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: (near initialization for `iobase_name[1]')
|
|---|
| 15 | ../sysdeps/unix/sysv/linux/arm/ioperm.c:104: error: initializer element is not constant
|
|---|
| 16 | ../sysdeps/unix/sysv/linux/arm/ioperm.c:104: error: (near initialization for `ioshift_name[1]')
|
|---|
| 17 | 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
|
|---|
| 18 |
|
|---|
| 19 | cf. "[SYSCTL] BUS_ISA -> CTL_BUS_ISA", http://www.ussg.iu.edu/hypermail/linux/kernel/0311.0/0529.html
|
|---|
| 20 |
|
|---|
| 21 | --- glibc-2.3.2/sysdeps/unix/sysv/linux/arm/ioperm.c.old 2003-02-20 14:22:24.000000000 -0800
|
|---|
| 22 | +++ glibc-2.3.2/sysdeps/unix/sysv/linux/arm/ioperm.c 2004-01-31 16:01:50.000000000 -0800
|
|---|
| 23 | @@ -47,6 +47,12 @@
|
|---|
| 24 | #include <asm/page.h>
|
|---|
| 25 | #include <sys/sysctl.h>
|
|---|
| 26 |
|
|---|
| 27 | +/* see http://www.ussg.iu.edu/hypermail/linux/kernel/0311.0/0529.html */
|
|---|
| 28 | +#include <linux/version.h>
|
|---|
| 29 | +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23))
|
|---|
| 30 | +#define CTL_BUS_ISA BUS_ISA /* and hope it's not the one from linux/input.h */
|
|---|
| 31 | +#endif
|
|---|
| 32 | +
|
|---|
| 33 | #define PATH_ARM_SYSTYPE "/etc/arm_systype"
|
|---|
| 34 | #define PATH_CPUINFO "/proc/cpuinfo"
|
|---|
| 35 |
|
|---|
| 36 | @@ -80,7 +86,7 @@
|
|---|
| 37 | * Initialize I/O system. There are several ways to get the information
|
|---|
| 38 | * we need. Each is tried in turn until one succeeds.
|
|---|
| 39 | *
|
|---|
| 40 | - * 1. Sysctl (CTL_BUS, BUS_ISA, ISA_*). This is the preferred method
|
|---|
| 41 | + * 1. Sysctl (CTL_BUS, CTL_BUS_ISA, ISA_*). This is the preferred method
|
|---|
| 42 | * but not all kernels support it.
|
|---|
| 43 | *
|
|---|
| 44 | * 2. Read the value (not the contents) of symlink PATH_ARM_SYSTYPE.
|
|---|
| 45 | @@ -100,8 +106,8 @@
|
|---|
| 46 | {
|
|---|
| 47 | char systype[256];
|
|---|
| 48 | int i, n;
|
|---|
| 49 | - static int iobase_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_BASE };
|
|---|
| 50 | - static int ioshift_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_SHIFT };
|
|---|
| 51 | + static int iobase_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_BASE };
|
|---|
| 52 | + static int ioshift_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_SHIFT };
|
|---|
| 53 | size_t len = sizeof(io.base);
|
|---|
| 54 |
|
|---|
| 55 | if (! sysctl (iobase_name, 3, &io.io_base, &len, NULL, 0)
|
|---|
