patches/linux/2.6.11.3/130-linux-2.6.11-allow-gcc-4.0-asm-m68k.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Aug 26 16:47:47 2008 +0000 (2008-08-26)
changeset 808 0949a87e1629
permissions -rw-r--r--
Commonalise options common to both glibc and eglibc.

/trunk/scripts/build/libc_eglibc.sh | 6 3 3 0 +-
/trunk/config/libc/glibc.in | 63 2 61 0 +---------------------------------
/trunk/config/libc/eglibc.in | 61 1 60 0 +--------------------------------
/trunk/config/libc/eglibc-glibc-common.in | 1 1 0 0 +
/trunk/config/libc/glibc-eglibc-common.in | 69 69 0 0 +++++++++++++++++++++++++++++++++++++
5 files changed, 76 insertions(+), 124 deletions(-)
yann@402
     1
Fixes
yann@402
     2
yann@402
     3
In file included from include/asm/setup.h:8,
yann@402
     4
                 from include/asm/machdep.h:8,
yann@402
     5
                 from include/asm/irq.h:6,
yann@402
     6
                 from include/asm/hardirq.h:8,
yann@402
     7
                 from include/linux/hardirq.h:6,
yann@402
     8
                 from include/asm-generic/local.h:6,
yann@402
     9
                 from include/asm/local.h:4,
yann@402
    10
                 from include/linux/module.h:21,
yann@402
    11
                 from init/main.c:16:
yann@402
    12
include/asm-m68k/setup.h:365: error: array type has incomplete element type
yann@402
    13
yann@402
    14
when compiling with gcc-4.0.  (Affects ppc, too, for some reason.)
yann@402
    15
yann@402
    16
--- linux-2.6.11.3/include/asm-m68k/setup.h.old	Fri Mar 18 13:48:03 2005
yann@402
    17
+++ linux-2.6.11.3/include/asm-m68k/setup.h	Fri Mar 18 13:48:14 2005
yann@402
    18
@@ -362,12 +362,13 @@
yann@402
    19
 #ifndef __ASSEMBLY__
yann@402
    20
 extern int m68k_num_memory;		/* # of memory blocks found (and used) */
yann@402
    21
 extern int m68k_realnum_memory;		/* real # of memory blocks found */
yann@402
    22
-extern struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */
yann@402
    23
 
yann@402
    24
 struct mem_info {
yann@402
    25
 	unsigned long addr;		/* physical address of memory chunk */
yann@402
    26
 	unsigned long size;		/* length of memory chunk (in bytes) */
yann@402
    27
 };
yann@402
    28
+
yann@402
    29
+extern struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */
yann@402
    30
 #endif
yann@402
    31
 
yann@402
    32
 #endif /* __KERNEL__ */