patches/gcc/4.4.3/390-arm-softfloat-libgcc.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)
bryanhundven@2201
     1
[PATCH] add the correct symbols to libgcc for uclibc arm softfloat
bryanhundven@2201
     2
bryanhundven@2201
     3
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
bryanhundven@2201
     4
---
bryanhundven@2201
     5
 gcc/config/arm/linux-elf.h |    2 +-
bryanhundven@2201
     6
 gcc/config/arm/t-linux     |    6 +++++-
bryanhundven@2201
     7
 2 files changed, 6 insertions(+), 2 deletions(-)
bryanhundven@2201
     8
bryanhundven@2201
     9
Index: gcc-4.4.0/gcc/config/arm/t-linux
bryanhundven@2201
    10
===================================================================
bryanhundven@2201
    11
--- gcc-4.4.0.orig/gcc/config/arm/t-linux
bryanhundven@2201
    12
+++ gcc-4.4.0/gcc/config/arm/t-linux
bryanhundven@2201
    13
@@ -4,7 +4,11 @@
bryanhundven@2201
    14
 
bryanhundven@2201
    15
 LIB1ASMSRC = arm/lib1funcs.asm
bryanhundven@2201
    16
 LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
bryanhundven@2201
    17
-	_arm_addsubdf3 _arm_addsubsf3
bryanhundven@2201
    18
+	_arm_addsubdf3 _arm_addsubsf3 \
bryanhundven@2201
    19
+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
bryanhundven@2201
    20
+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
bryanhundven@2201
    21
+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
bryanhundven@2201
    22
+	_arm_fixsfsi _arm_fixunssfsi
bryanhundven@2201
    23
 
bryanhundven@2201
    24
 # MULTILIB_OPTIONS = mhard-float/msoft-float
bryanhundven@2201
    25
 # MULTILIB_DIRNAMES = hard-float soft-float
bryanhundven@2201
    26
Index: gcc-4.4.0/gcc/config/arm/linux-elf.h
bryanhundven@2201
    27
===================================================================
bryanhundven@2201
    28
--- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h
bryanhundven@2201
    29
+++ gcc-4.4.0/gcc/config/arm/linux-elf.h
bryanhundven@2201
    30
@@ -60,7 +60,7 @@
bryanhundven@2201
    31
    %{shared:-lc} \
bryanhundven@2201
    32
    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
bryanhundven@2201
    33
 
bryanhundven@2201
    34
-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
bryanhundven@2201
    35
+#define LIBGCC_SPEC "-lgcc"
bryanhundven@2201
    36
 
bryanhundven@2201
    37
 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
bryanhundven@2201
    38