patches/eglibc/2_9/100-powerpc-8xx-CPU15-errata.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
yann@1328
     1
diff -ru eglibc-2_9_orig/sysdeps/powerpc/powerpc32/memset.S eglibc-2_9/sysdeps/powerpc/powerpc32/memset.S
yann@1328
     2
--- eglibc-2_9_orig/sysdeps/powerpc/powerpc32/memset.S	2007-04-13 08:35:45.000000000 -0700
yann@1328
     3
+++ eglibc-2_9/sysdeps/powerpc/powerpc32/memset.S	2009-05-06 16:52:04.000000000 -0700
yann@1328
     4
@@ -112,11 +112,13 @@
yann@1328
     5
 	clrrwi.	rALIGN, rLEN, 5
yann@1328
     6
 	mtcrf	0x01, rLEN	/* 40th instruction from .align */
yann@1328
     7
 
yann@1328
     8
+#ifndef BROKEN_PPC_8xx_CPU15
yann@1328
     9
 /* Check if we can use the special case for clearing memory using dcbz.
yann@1328
    10
    This requires that we know the correct cache line size for this
yann@1328
    11
    processor.  Getting the __cache_line_size may require establishing GOT
yann@1328
    12
    addressability, so branch out of line to set this up.  */
yann@1328
    13
 	beq	cr1, L(checklinesize)
yann@1328
    14
+#endif
yann@1328
    15
 
yann@1328
    16
 /* Store blocks of 32-bytes (256-bits) starting on a 32-byte boundary.
yann@1328
    17
    Can't assume that rCHR is zero or that the cache line size is either
yann@1328
    18
@@ -158,6 +160,7 @@
yann@1328
    19
 	add	rMEMP, rMEMP, rALIGN
yann@1328
    20
 	b	L(medium_tail2)	/* 72nd instruction from .align */
yann@1328
    21
 
yann@1328
    22
+#ifndef BROKEN_PPC_8xx_CPU15
yann@1328
    23
 	.align	5
yann@1328
    24
 	nop
yann@1328
    25
 /* Clear cache lines of memory in 128-byte chunks.
yann@1328
    26
@@ -191,6 +194,7 @@
yann@1328
    27
 	bdnz	L(zloop)
yann@1328
    28
 	beqlr	cr5
yann@1328
    29
 	b	L(medium_tail2)
yann@1328
    30
+#endif /* ! BROKEN_PPC_8xx_CPU15 */
yann@1328
    31
 
yann@1328
    32
 	.align	5
yann@1328
    33
 L(small):
yann@1328
    34
@@ -248,6 +252,7 @@
yann@1328
    35
 	stw	rCHR, -8(rMEMP)
yann@1328
    36
 	blr
yann@1328
    37
 
yann@1328
    38
+#ifndef BROKEN_PPC_8xx_CPU15
yann@1328
    39
 L(checklinesize):
yann@1328
    40
 #ifdef SHARED
yann@1328
    41
 	mflr	rTMP
yann@1328
    42
@@ -329,6 +334,7 @@
yann@1328
    43
 L(handletail32):
yann@1328
    44
 	clrrwi.	rALIGN, rLEN, 5
yann@1328
    45
 	b	L(nondcbz)
yann@1328
    46
+#endif /* ! BROKEN_PPC_8xx_CPU15 */
yann@1328
    47
 
yann@1328
    48
 END (BP_SYM (memset))
yann@1328
    49
 libc_hidden_builtin_def (memset)