patches/strace/4.5.18/180-arm-EABI-syscalls.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@1396
     1
Patch from upstream:
yann@1396
     2
http://strace.cvs.sourceforge.net/viewvc/strace/strace/linux/arm/syscallent.h?r1=1.17&r2=1.18&sortby=file
yann@1396
     3
yann@1396
     4
2008-11-13  Kirill A. Shutemov  <kirill@shutemov.name>
yann@1396
     5
yann@1396
     6
    * linux/arm/syscallent.h: Fix build on ARM EABI which does not
yann@1396
     7
    provide syscalls socketcall and ipc.
yann@1396
     8
yann@1396
     9
--- strace-4.5.18.orig/linux/arm/syscallent.h	2008/12/29 20:04:15	1.17
yann@1396
    10
+++ strace-4.5.18/linux/arm/syscallent.h	2009/01/01 23:20:38	1.18
yann@1396
    11
@@ -431,6 +431,7 @@
yann@1396
    12
 	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
yann@1396
    13
 	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
yann@1396
    14
 
yann@1396
    15
+#ifndef __ARM_EABI__
yann@1396
    16
 #if SYS_socket_subcall != 400
yann@1396
    17
  #error fix me
yann@1396
    18
 #endif
yann@1396
    19
@@ -481,3 +482,4 @@
yann@1396
    20
 	{ 4,	TI,	sys_shmdt,		"shmdt"		}, /* 440 */
yann@1396
    21
 	{ 4,	TI,	sys_shmget,		"shmget"	}, /* 441 */
yann@1396
    22
 	{ 4,	TI,	sys_shmctl,		"shmctl"	}, /* 442 */
yann@1396
    23
+#endif