Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/3.4.6/190-all_sh-pr16665-fix.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28)
changeset 2573 424fa2092ace
parent 402 197e1b49586e
permissions -rw-r--r--
scripts/libc: do not build add-ons by default

Currently, no --enable-add-ons option is passed to libc configure when
"$(do_libc_add_ons_list ,)" is empty, which makes configure automatically search
for present add-ons. In that case, all present add-ons are built, although
no add-on was selected by the user in the config. Moreover, this can make the
configure fail if some non-standard add-ons like eglibc-localedef are present.

This behavior also leads to an inconsistency from a user point of view between
the following cases:
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS="none" in the config,
which makes "$(do_libc_add_ons_list ,)" return "", so all present add-ons
are built.
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS!="none" in the
config, which makes "$(do_libc_add_ons_list ,)" return the add-on supporting
the chosen threading implementation, e.g. "nptl", so only this add-on is
built.

This patch disables the building of all add-ons in that case.

It is still possible to build all present add-ons by adding --enable-add-ons to
LIBC_GLIBC_EXTRA_CONFIG_ARRAY.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com> 
     1 diff -durN gcc-3.4.6.orig/gcc/config/sh/sh.c gcc-3.4.6/gcc/config/sh/sh.c

     2 --- gcc-3.4.6.orig/gcc/config/sh/sh.c	2004-09-03 08:51:30.000000000 +0200

     3 +++ gcc-3.4.6/gcc/config/sh/sh.c	2007-08-15 23:01:48.000000000 +0200

     4 @@ -9107,6 +9107,15 @@

     5      }

     6    this = FUNCTION_ARG (cum, Pmode, ptr_type_node, 1);

     7  

     8 +  /* In PIC case, we set PIC register to compute the target address.  We

     9 +     can use a scratch register to save and restore the original value  

    10 +     except for SHcompact.  For SHcompact, use stack.  */

    11 +  if (flag_pic && TARGET_SHCOMPACT)

    12 +    {

    13 +      push (PIC_OFFSET_TABLE_REGNUM);

    14 +      emit_insn (gen_GOTaddr2picreg ());

    15 +    }

    16 +

    17    /* For SHcompact, we only have r0 for a scratch register: r1 is the

    18       static chain pointer (even if you can't have nested virtual functions

    19       right now, someone might implement them sometime), and the rest of the

    20 @@ -9189,8 +9198,24 @@

    21        assemble_external (function);

    22        TREE_USED (function) = 1;

    23      }

    24 +  /* We can use scratch1 to save and restore the original value of

    25 +     PIC register except for SHcompact.  */

    26 +  if (flag_pic && ! TARGET_SHCOMPACT)

    27 +    {

    28 +      emit_move_insn (scratch1,

    29 +		      gen_rtx_REG (Pmode, PIC_OFFSET_TABLE_REGNUM));

    30 +      emit_insn (gen_GOTaddr2picreg ());

    31 +    }

    32    funexp = XEXP (DECL_RTL (function), 0);

    33    emit_move_insn (scratch2, funexp);

    34 +  if (flag_pic)

    35 +    {

    36 +      if (! TARGET_SHCOMPACT)

    37 +	emit_move_insn (gen_rtx_REG (Pmode, PIC_OFFSET_TABLE_REGNUM),

    38 +			scratch1);

    39 +      else

    40 +	pop (PIC_OFFSET_TABLE_REGNUM);

    41 +    }

    42    funexp = gen_rtx_MEM (FUNCTION_MODE, scratch2);

    43    sibcall = emit_call_insn (gen_sibcall (funexp, const0_rtx, NULL_RTX));

    44    SIBLING_CALL_P (sibcall) = 1;
crosstool-ng