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

   1 $DragonFly: src/gnu/usr.bin/cc34/cc_prep/patches/gcc.c.patch,v 1.2 2004/12/21 13:10:48 joerg Exp $
   2
   3 ===================================================================
   4 RCS file: /home/joerg/wd/repository/dragonflybsd/src/contrib/gcc-3.4/gcc/gcc.c,v
   5 retrieving revision 1.2
   6 diff -u -r1.2 gcc.c
   7 --- gcc.c       20 Dec 2004 19:23:24 -0000      1.2
   8 +++ gcc.c       20 Dec 2004 20:48:10 -0000
   9 @@ -1408,8 +1408,7 @@
  10  static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
  11  static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
  12  static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
  13 -static const char *const standard_startfile_prefix_1 = "/lib/";
  14 -static const char *const standard_startfile_prefix_2 = "/usr/lib/";
  15 +static const char *const standard_startfile_prefix_1 = STANDARD_STARTFILE_PREFIX_1;
  16
  17  static const char *const tooldir_base_prefix = TOOLDIR_BASE_PREFIX;
  18  static const char *tooldir_prefix;
  19 @@ -3214,8 +3213,6 @@
  20        set_std_prefix (gcc_exec_prefix, len);
  21        add_prefix (&exec_prefixes, gcc_libexec_prefix, "GCC",
  22                   PREFIX_PRIORITY_LAST, 0, NULL, 0);
  23 -      add_prefix (&startfile_prefixes, gcc_exec_prefix, "GCC",
  24 -                 PREFIX_PRIORITY_LAST, 0, NULL, 0);
  25      }
  26
  27    /* COMPILER_PATH and LIBRARY_PATH have values
  28 @@ -3763,11 +3760,6 @@
  29               PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0);
  30  #endif
  31
  32 -  add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS",
  33 -             PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0);
  34 -  add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
  35 -             PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0);
  36 -
  37    tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
  38                            dir_separator_str, NULL);
  39
  40 @@ -3790,10 +3782,6 @@
  41                       concat (gcc_exec_tooldir_prefix, "bin",
  42                               dir_separator_str, NULL),
  43                       NULL, PREFIX_PRIORITY_LAST, 0, NULL, 0);
  44 -         add_prefix (&startfile_prefixes,
  45 -                     concat (gcc_exec_tooldir_prefix, "lib",
  46 -                             dir_separator_str, NULL),
  47 -                     NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1);
  48         }
  49
  50        tooldir_prefix = concat (standard_exec_prefix, spec_machine,
  51 @@ -3804,9 +3792,6 @@
  52    add_prefix (&exec_prefixes,
  53               concat (tooldir_prefix, "bin", dir_separator_str, NULL),
  54               "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 0);
  55 -  add_prefix (&startfile_prefixes,
  56 -             concat (tooldir_prefix, "lib", dir_separator_str, NULL),
  57 -             "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
  58
  59  #if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)
  60    /* If the normal TARGET_SYSTEM_ROOT is inside of $exec_prefix,
  61 @@ -6124,35 +6109,10 @@
  62         add_sysrooted_prefix (&startfile_prefixes, md_startfile_prefix_1,
  63                               "GCC", PREFIX_PRIORITY_LAST, 0, NULL, 1);
  64
  65 -      /* If standard_startfile_prefix is relative, base it on
  66 -        standard_exec_prefix.  This lets us move the installed tree
  67 -        as a unit.  If GCC_EXEC_PREFIX is defined, base
  68 -        standard_startfile_prefix on that as well.
  69 -
  70 -         If the prefix is relative, only search it for native compilers;
  71 -         otherwise we will search a directory containing host libraries.  */
  72 -      if (IS_ABSOLUTE_PATH (standard_startfile_prefix))
  73 -       add_sysrooted_prefix (&startfile_prefixes,
  74 -                             standard_startfile_prefix, "BINUTILS",
  75 -                             PREFIX_PRIORITY_LAST, 0, NULL, 1);
  76 -      else if (*cross_compile == '0')
  77 -       {
  78 -         if (gcc_exec_prefix)
  79 -           add_prefix (&startfile_prefixes,
  80 -                       concat (gcc_exec_prefix, machine_suffix,
  81 -                               standard_startfile_prefix, NULL),
  82 -                       NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1);
  83 -         add_prefix (&startfile_prefixes,
  84 -                     concat (standard_exec_prefix,
  85 -                             machine_suffix,
  86 -                             standard_startfile_prefix, NULL),
  87 -                     NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1);
  88 -       }
  89 -
  90 -      add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_1,
  91 -                           "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
  92 -      add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_2,
  93 -                           "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
  94 +      add_prefix (&startfile_prefixes, standard_startfile_prefix,
  95 +                           "GCC", PREFIX_PRIORITY_LAST, 0, NULL, 1);
  96 +      add_prefix (&startfile_prefixes, standard_startfile_prefix_1,
  97 +                           "GCC", PREFIX_PRIORITY_LAST, 0, NULL, 1);
  98  #if 0 /* Can cause surprises, and one can use -B./ instead.  */
  99        add_prefix (&startfile_prefixes, "./", NULL,
 100                   PREFIX_PRIORITY_LAST, 1, NULL, 0);