patches/gcc/4.3.5/310-arm-softfloat.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
parent 1461 35b30f8fb307
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)
thomas@1461
     1
Original patch from: ../4.3.2/310-arm-softfloat.patch
thomas@1461
     2
thomas@1461
     3
-= BEGIN original header =-
thomas@1461
     4
-= END original header =-
thomas@1461
     5
thomas@1461
     6
diff -durN gcc-4.3.3.orig/gcc/config/arm/linux-elf.h gcc-4.3.3/gcc/config/arm/linux-elf.h
thomas@1461
     7
--- gcc-4.3.3.orig/gcc/config/arm/linux-elf.h	2007-11-08 14:44:09.000000000 +0100
thomas@1461
     8
+++ gcc-4.3.3/gcc/config/arm/linux-elf.h	2009-01-27 22:25:47.000000000 +0100
thomas@1461
     9
@@ -60,7 +60,7 @@
thomas@1461
    10
    %{shared:-lc} \
thomas@1461
    11
    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
thomas@1461
    12
 
thomas@1461
    13
-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
thomas@1461
    14
+#define LIBGCC_SPEC "-lgcc"
thomas@1461
    15
 
thomas@1461
    16
 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
thomas@1461
    17
 
thomas@1461
    18
diff -durN gcc-4.3.3.orig/gcc/config/arm/t-linux gcc-4.3.3/gcc/config/arm/t-linux
thomas@1461
    19
--- gcc-4.3.3.orig/gcc/config/arm/t-linux	2006-11-09 23:14:27.000000000 +0100
thomas@1461
    20
+++ gcc-4.3.3/gcc/config/arm/t-linux	2009-01-27 22:25:47.000000000 +0100
thomas@1461
    21
@@ -3,7 +3,12 @@
thomas@1461
    22
 TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fPIC
thomas@1461
    23
 
thomas@1461
    24
 LIB1ASMSRC = arm/lib1funcs.asm
thomas@1461
    25
-LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
thomas@1461
    26
+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func \
thomas@1461
    27
+	_call_via_rX _interwork_call_via_rX \
thomas@1461
    28
+	_lshrdi3 _ashrdi3 _ashldi3 \
thomas@1461
    29
+	_negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
thomas@1461
    30
+	_truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
thomas@1461
    31
+	_fixsfsi _fixunssfsi _floatdidf _floatdisf _floatundidf _floatundisf
thomas@1461
    32
 
thomas@1461
    33
 # MULTILIB_OPTIONS = mhard-float/msoft-float
thomas@1461
    34
 # MULTILIB_DIRNAMES = hard-float soft-float