source: scripts/patches/glibc-arm-ctl_bus_isa.patch@ 554101e

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 554101e was 7f65c0e, checked in by Jim Gifford <clfs@…>, 19 years ago

r625@server (orig r623): jim | 2005-10-31 12:43:24 -0800
Final Move
  • Property mode set to 100644
File size: 2.7 KB

  • glibc-2.3.2/sysdeps/unix/sysv/linux/arm/ioperm.c 

    Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
Source: Dan Kegel's crosstool ( http://kegel.com/crosstool )
Initial Package Version: See Below

Applies to both glibc-2.2.5 and glibc-2.3.2, and probably glibc cvs as of Aug 2004.
Needed to build glibc with linux kernels 2.4.23 or higher on ARM, 
Fixes following error:

../sysdeps/unix/sysv/linux/arm/ioperm.c: In function `init_iosys':
../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: `BUS_ISA' undeclared (first use in this function)
../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: (Each undeclared identifier is reported only once
../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: for each function it appears in.)
../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: initializer element is not constant
../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: (near initialization for `iobase_name[1]')
../sysdeps/unix/sysv/linux/arm/ioperm.c:104: error: initializer element is not constant
../sysdeps/unix/sysv/linux/arm/ioperm.c:104: error: (near initialization for `ioshift_name[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

cf. "[SYSCTL] BUS_ISA -> CTL_BUS_ISA",  http://www.ussg.iu.edu/hypermail/linux/kernel/0311.0/0529.html
    old new  
    4747#include <asm/page.h>
    4848#include <sys/sysctl.h>
    4949
     50/* see http://www.ussg.iu.edu/hypermail/linux/kernel/0311.0/0529.html */
     51#include <linux/version.h>
     52#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23))
     53#define CTL_BUS_ISA BUS_ISA     /* and hope it's not the one from linux/input.h */
     54#endif
     55
    5056#define PATH_ARM_SYSTYPE        "/etc/arm_systype"
    5157#define PATH_CPUINFO            "/proc/cpuinfo"
    5258
    … …  
    8086 * Initialize I/O system.  There are several ways to get the information
    8187 * we need.  Each is tried in turn until one succeeds.
    8288 *
    83  * 1. Sysctl (CTL_BUS, BUS_ISA, ISA_*).  This is the preferred method
     89 * 1. Sysctl (CTL_BUS, CTL_BUS_ISA, ISA_*).  This is the preferred method
    8490 *    but not all kernels support it.
    8591 *
    8692 * 2. Read the value (not the contents) of symlink PATH_ARM_SYSTYPE.
    … …  
    100106{
    101107  char systype[256];
    102108  int i, n;
    103   static int iobase_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_BASE };
    104   static int ioshift_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_SHIFT };
     109  static int iobase_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_BASE };
     110  static int ioshift_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_SHIFT };
    105111  size_t len = sizeof(io.base);
    106112
    107113  if (! sysctl (iobase_name, 3, &io.io_base, &len, NULL, 0)
Note: See TracBrowser for help on using the repository browser.