gnu/usr.bin/cc40/cc_prep/patches/gcc.c.patch

   1 $DragonFly: src/gnu/usr.bin/cc40/cc_prep/patches/Attic/gcc.c.patch,v 1.1 2005/06/05 22:43:20 corecode Exp $
   2
   3 --- gcc.c.orig  2005-04-16 03:38:45.000000000 +0200
   4 +++ gcc.c       2005-05-04 15:33:40.000000000 +0200
   5 @@ -3254,8 +3254,6 @@
   6        set_std_prefix (gcc_exec_prefix, len);
   7        add_prefix (&exec_prefixes, gcc_libexec_prefix, "GCC",
   8                   PREFIX_PRIORITY_LAST, 0, 0);
   9 -      add_prefix (&startfile_prefixes, gcc_exec_prefix, "GCC",
  10 -                 PREFIX_PRIORITY_LAST, 0, 0);
  11      }
  12
  13    /* COMPILER_PATH and LIBRARY_PATH have values
  14 @@ -3803,11 +3801,6 @@
  15               PREFIX_PRIORITY_LAST, 2, 0);
  16  #endif
  17
  18 -  add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS",
  19 -             PREFIX_PRIORITY_LAST, 1, 0);
  20 -  add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
  21 -             PREFIX_PRIORITY_LAST, 1, 0);
  22 -
  23    tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
  24                            dir_separator_str, NULL);
  25
  26 @@ -3830,10 +3823,6 @@
  27                       concat (gcc_exec_tooldir_prefix, "bin",
  28                               dir_separator_str, NULL),
  29                       NULL, PREFIX_PRIORITY_LAST, 0, 0);
  30 -         add_prefix (&startfile_prefixes,
  31 -                     concat (gcc_exec_tooldir_prefix, "lib",
  32 -                             dir_separator_str, NULL),
  33 -                     NULL, PREFIX_PRIORITY_LAST, 0, 1);
  34         }
  35
  36        tooldir_prefix = concat (standard_exec_prefix, spec_machine,
  37 @@ -3844,9 +3833,6 @@
  38    add_prefix (&exec_prefixes,
  39               concat (tooldir_prefix, "bin", dir_separator_str, NULL),
  40               "BINUTILS", PREFIX_PRIORITY_LAST, 0, 0);
  41 -  add_prefix (&startfile_prefixes,
  42 -             concat (tooldir_prefix, "lib", dir_separator_str, NULL),
  43 -             "BINUTILS", PREFIX_PRIORITY_LAST, 0, 1);
  44
  45  #if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)
  46    /* If the normal TARGET_SYSTEM_ROOT is inside of $exec_prefix,
  47 @@ -6198,39 +6184,10 @@
  48         add_sysrooted_prefix (&startfile_prefixes, md_startfile_prefix_1,
  49                               "GCC", PREFIX_PRIORITY_LAST, 0, 1);
  50
  51 -      /* If standard_startfile_prefix is relative, base it on
  52 -        standard_exec_prefix.  This lets us move the installed tree
  53 -        as a unit.  If GCC_EXEC_PREFIX is defined, base
  54 -        standard_startfile_prefix on that as well.
  55 -
  56 -         If the prefix is relative, only search it for native compilers;
  57 -         otherwise we will search a directory containing host libraries.  */
  58 -      if (IS_ABSOLUTE_PATH (standard_startfile_prefix))
  59 -       add_sysrooted_prefix (&startfile_prefixes,
  60 -                             standard_startfile_prefix, "BINUTILS",
  61 -                             PREFIX_PRIORITY_LAST, 0, 1);
  62 -      else if (*cross_compile == '0')
  63 -       {
  64 -         if (gcc_exec_prefix)
  65 -           add_prefix (&startfile_prefixes,
  66 -                       concat (gcc_exec_prefix, machine_suffix,
  67 -                               standard_startfile_prefix, NULL),
  68 -                       NULL, PREFIX_PRIORITY_LAST, 0, 1);
  69 -         add_prefix (&startfile_prefixes,
  70 -                     concat (standard_exec_prefix,
  71 -                             machine_suffix,
  72 -                             standard_startfile_prefix, NULL),
  73 -                     NULL, PREFIX_PRIORITY_LAST, 0, 1);
  74 -       }
  75 -
  76 -      if (*standard_startfile_prefix_1)
  77 -       add_sysrooted_prefix (&startfile_prefixes,
  78 -                             standard_startfile_prefix_1, "BINUTILS",
  79 -                             PREFIX_PRIORITY_LAST, 0, 1);
  80 -      if (*standard_startfile_prefix_2)
  81 -       add_sysrooted_prefix (&startfile_prefixes,
  82 -                             standard_startfile_prefix_2, "BINUTILS",
  83 -                             PREFIX_PRIORITY_LAST, 0, 1);
  84 +      add_prefix (&startfile_prefixes, standard_startfile_prefix,
  85 +                           "GCC", PREFIX_PRIORITY_LAST, 0, 1);
  86 +      add_prefix (&startfile_prefixes, standard_startfile_prefix_1,
  87 +                           "GCC", PREFIX_PRIORITY_LAST, 0, 1);
  88      }
  89
  90    /* Process any user specified specs in the order given on the command