toolchain/gcc/patches/linaro/850-use_shared_libgcc.patch

   1 --- a/gcc/config/arm/linux-eabi.h
   2 +++ b/gcc/config/arm/linux-eabi.h
   3 @@ -95,10 +95,6 @@
   4  #define ENDFILE_SPEC \
   5    LINUX_OR_ANDROID_LD (LINUX_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC)
   6
   7 -/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we
   8 -   do not use -lfloat.  */
   9 -#undef LIBGCC_SPEC
  10 -
  11  /* Clear the instruction cache from `beg' to `end'.  This is
  12     implemented in lib1funcs.asm, so ensure an error if this definition
  13     is used.  */
  14 --- a/gcc/config/arm/linux-elf.h
  15 +++ b/gcc/config/arm/linux-elf.h
  16 @@ -60,8 +60,6 @@
  17     %{shared:-lc} \
  18     %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
  19
  20 -#define LIBGCC_SPEC "-lgcc"
  21 -
  22  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  23
  24  #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
  25 --- a/gcc/config/linux.h
  26 +++ b/gcc/config/linux.h
  27 @@ -116,6 +116,10 @@ see the files COPYING3 and COPYING.RUNTI
  28  #define USE_LD_AS_NEEDED 1
  29  #endif
  30
  31 +#ifndef LIBGCC_SPEC
  32 +#define LIBGCC_SPEC "%{static|static-libgcc:-lgcc}%{!static:%{!static-libgcc:-lgcc_s}}"
  33 +#endif
  34 +
  35  /* Determine which dynamic linker to use depending on whether GLIBC or
  36     uClibc or Bionic is the default C library and whether
  37     -muclibc or -mglibc or -mbionic has been passed to change the default.  */
  38 --- a/gcc/mkmap-symver.awk
  39 +++ b/gcc/mkmap-symver.awk
  40 @@ -132,5 +132,5 @@ function output(lib) {
  41    else if (inherit[lib])
  42      printf("} %s;\n", inherit[lib]);
  43    else
  44 -    printf ("\n  local:\n\t*;\n};\n");
  45 +    printf ("\n\t*;\n};\n");
  46  }
  47 --- a/libgcc/Makefile.in
  48 +++ b/libgcc/Makefile.in
  49 @@ -265,7 +265,7 @@ ifeq ($(enable_shared),yes)
  50  # For -fvisibility=hidden.  We need both a -fvisibility=hidden on
  51  # the command line, and a #define to prevent libgcc2.h etc from
  52  # overriding that with #pragmas.
  53 -vis_hide = @vis_hide@
  54 +vis_hide =
  55
  56  ifneq (,$(vis_hide))
  57
  58 --- a/gcc/config/rs6000/linux.h
  59 +++ b/gcc/config/rs6000/linux.h
  60 @@ -85,6 +85,8 @@
  61  #define USE_LD_AS_NEEDED 1
  62  #endif
  63
  64 +#define LIBGCC_SPEC "%{!static:%{!static-libgcc:-lgcc_s}} -lgcc"
  65 +
  66  #undef  TARGET_VERSION
  67  #define TARGET_VERSION fprintf (stderr, " (PowerPC GNU/Linux)");
  68