source: scripts/patches/gcc-4.1.0-fix_PR20425.patch@ e75365c

gcc/ChangeLog

@@ +1 @@
+2006-03-10  Ryan Oliver <ryan@linuxfromscratch.org>
+        Backport:
+        2005-12-16  Alan Modra  <amodra@bigpond.net.au>
+        PR driver/20425
+        * gcc.c (for_each_path): New function.
+        (add_to_obstack, file_at_path): New functions.
+        (struct file_at_path_info, struct add_to_obstack_info): New.
+        (build_search_list): Rewrite using for_each_path.  Constify struct
+        path_prefix pointer.  Add do_multi param.  Adjust all callers.
+        (find_a_file): Similarly, but just change existing param to bool.
+        (putenv_from_prefixes): Add do_multi param, make "paths" const.
+        (do_spec_path): Delete.
+        (struct spec_path_info): New.
+        (spec_path): New function.
+        (do_spec_1): Use for_each_path for %D and %I.
+        (find_file): Adjust for find_a_file changes.
+        (main): Search multilibs for specs.  Print multilib lib path for
+        -print-search-dirs.  Likewise add multilibs to LIBRARY_PATH_ENV.
+        (read_specs): Search multilibs for %include and %include_noerr.
+        (is_directory): Remove second string param.  Change last param
+        to a bool.  Don't use concat.  Remove SMALL_ARG_MAX test, always
+        check path is a dir.  Update all callers.
+        * doc/hostconfig.texi (SMALL_ARG_MAX): Remove mention.
+        * system.h (SMALL_ARG_MAX): Poison.
+        * config.gcc: Don't define SMALL_ARG_MAX.
+        * config.host: Likewise.
+        * config.build: Likewise.
+
 2006-02-28  Release Manager
 
         * GCC 4.1.0 released.

gcc/config.build

@@ -90 +90 @@
     build_install_headers_dir=install-headers-cpio
     ;;
   i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4* )
-    build_xm_defines="SMALL_ARG_MAX"
     build_install_headers_dir=install-headers-cpio
     ;;
-  i[34567]86-*-solaris2*)
-    build_xm_defines="SMALL_ARG_MAX"
-    ;;
   i[34567]86-*-sysv4*) 
     # Intel x86 running system V r4
-    build_xm_defines="SMALL_ARG_MAX"
     build_install_headers_dir=install-headers-cpio
     ;;
   i[34567]86-*-udk*) 

gcc/config.gcc

@@ -994 +994 @@
         then
                 tm_file="${tm_file} usegas.h"
         fi
-        xm_defines="SMALL_ARG_MAX"
         tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ptx4.h i386/ptx4-i.h"
         tmake_file=t-svr4
         extra_parts="crtbegin.o crtend.o"
@@ -1125 +1124 @@
         use_fixproto=yes
         ;;
 i[34567]86-*-solaris2*)
-        xm_defines="SMALL_ARG_MAX"
         tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h"
         case ${target} in
         *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
@@ -1192 +1190 @@
         use_fixproto=yes
        ;;
 i[34567]86-*-sysv4*)            # Intel 80386's running system V.4
-        xm_defines="SMALL_ARG_MAX"
         tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv4-cpp.h"
         if test x$stabs = xyes
         then

gcc/config.host

@@ -135 +135 @@
   i370-*-opened* | i370-*-mvs* ) # IBM 360/370/390 Architecture
     host_xm_defines='FATAL_EXIT_CODE=12'
     ;;
-  i[34567]86-sequent-ptx4*)
-    host_xm_defines="SMALL_ARG_MAX"
-    ;;
   i[34567]86-*-solaris2*)
-    host_xm_defines="SMALL_ARG_MAX"
     out_host_hook_obj=host-solaris.o
     host_xmake_file=x-solaris
     ;;
-  i[34567]86-*-sysv4*) # Intel 80386's running System V Release 4
-    host_xm_defines="SMALL_ARG_MAX"
-    ;;
   i[34567]86-pc-msdosdjgpp*)
     host_xm_file=i386/xm-djgpp.h
     host_exeext=.exe

gcc/doc/hostconfig.texi

@@ -208 +208 @@
 If defined, a C statement (sans semicolon) that performs host-dependent
 initialization when a compilation driver is being initialized.
 
-@item SMALL_ARG_MAX
-Define this macro if the host system has a small limit on the total
-size of an argument vector.  This causes the driver to take more care
-not to pass unnecessary arguments to subprocesses.
-
 @item HOST_LONG_LONG_FORMAT
 If defined, the string used to indicate an argument of type @code{long
 long} to functions like @code{printf}.  The default value is

gcc/gcc.c

@@ -287 +287 @@
 static void read_specs (const char *, int);
 static void set_spec (const char *, const char *);
 static struct compiler *lookup_compiler (const char *, size_t, const char *);
-static char *build_search_list (struct path_prefix *, const char *, int);
-static void putenv_from_prefixes (struct path_prefix *, const char *);
+static char *build_search_list (const struct path_prefix *, const char *,
+                                bool, bool);
+static void putenv_from_prefixes (const struct path_prefix *, const char *,
+                                  bool);
 static int access_check (const char *, int);
-static char *find_a_file (struct path_prefix *, const char *, int, int);
+static char *find_a_file (const struct path_prefix *, const char *, int, bool);
 static void add_prefix (struct path_prefix *, const char *, const char *,
                         int, int, int);
 static void add_sysrooted_prefix (struct path_prefix *, const char *,
@@ -313 +315 @@
 static const char *handle_spec_function (const char *);
 static char *save_string (const char *, int);
 static void set_collect_gcc_options (void);
-static void do_spec_path (struct prefix_list *, const char *, int, int, int, const char *, const char *);
 static int do_spec_1 (const char *, int, const char *);
 static int do_spec_2 (const char *);
 static void do_option_spec (const char *, const char *);
 static void do_self_spec (const char *);
 static const char *find_file (const char *);
-static int is_directory (const char *, const char *, int);
+static int is_directory (const char *, bool);
 static const char *validate_switches (const char *);
 static void validate_all_switches (void);
 static inline void validate_switches_from_spec (const char *);
@@ -2036 +2037 @@
                        (long) (p1 - buffer + 1));
 
               p[-2] = '\0';
-              new_filename = find_a_file (&startfile_prefixes, p1, R_OK, 0);
+              new_filename = find_a_file (&startfile_prefixes, p1, R_OK, true);
               read_specs (new_filename ? new_filename : p1, FALSE);
               continue;
             }
@@ -2055 +2056 @@
                        (long) (p1 - buffer + 1));
 
               p[-2] = '\0';
-              new_filename = find_a_file (&startfile_prefixes, p1, R_OK, 0);
+              new_filename = find_a_file (&startfile_prefixes, p1, R_OK, true);
               if (new_filename)
                 read_specs (new_filename, FALSE);
               else if (verbose_flag)
@@ -2352 +2353 @@
   failure_delete_queue = 0;
 }
 
 
-/* Build a list of search directories from PATHS.
-   PREFIX is a string to prepend to the list.
-   If CHECK_DIR_P is nonzero we ensure the directory exists.
-   This is used mostly by putenv_from_prefixes so we use `collect_obstack'.
-   It is also used by the --print-search-dirs flag.  */
-
-static char *
-build_search_list (struct path_prefix *paths, const char *prefix,
-                   int check_dir_p)
+/* Call CALLBACK for each path in PATHS, breaking out early if CALLBACK
+   returns non-NULL.
+   If DO_MULTI is true iterate over the paths twice, first with multilib
+   suffix then without, otherwise iterate over the paths once without
+   adding a multilib suffix.  When DO_MULTI is true, some attempt is made
+   to avoid visiting the same path twice, but we could do better.  For
+   instance, /usr/lib/../lib is considered different from /usr/lib.
+   At least EXTRA_SPACE chars past the end of the path passed to
+   CALLBACK are available for use by the callback.
+   CALLBACK_INFO allows extra parameters to be passed to CALLBACK.
+
+   Returns the value returned by CALLBACK.  */
+
+static void *
+for_each_path (const struct path_prefix *paths,
+               bool do_multi,
+               size_t extra_space,
+               void *(*callback) (char *, void *),
+               void *callback_info)
 {
-  int suffix_len = (machine_suffix) ? strlen (machine_suffix) : 0;
-  int just_suffix_len
-    = (just_machine_suffix) ? strlen (just_machine_suffix) : 0;
-  int first_time = TRUE;
-  struct prefix_list *pprefix;
-
-  obstack_grow (&collect_obstack, prefix, strlen (prefix));
-  obstack_1grow (&collect_obstack, '=');
+  struct prefix_list *pl;
+  const char *multi_dir = NULL;
+  const char *multi_os_dir = NULL;
+  const char *multi_suffix;
+  const char *just_multi_suffix;
+  char *path = NULL;
+  void *ret = NULL;
+  bool skip_multi_dir = false;
+  bool skip_multi_os_dir = false;
+
+  multi_suffix = machine_suffix;
+  just_multi_suffix = just_machine_suffix;
+  if (do_multi && multilib_dir && strcmp (multilib_dir, ".") != 0)
+    {
+      multi_dir = concat (multilib_dir, dir_separator_str, NULL);
+      multi_suffix = concat (multi_suffix, multi_dir, NULL);
+      just_multi_suffix = concat (just_multi_suffix, multi_dir, NULL);
+    }
+  if (do_multi && multilib_os_dir && strcmp (multilib_os_dir, ".") != 0)
+    multi_os_dir = concat (multilib_os_dir, dir_separator_str, NULL);
 
-  for (pprefix = paths->plist; pprefix != 0; pprefix = pprefix->next)
+  while (1)
     {
-      int len = strlen (pprefix->prefix);
+      size_t multi_dir_len = 0;
+      size_t multi_os_dir_len = 0;
+      size_t suffix_len;
+      size_t just_suffix_len;
+      size_t len;
+
+      if (multi_dir)
+        multi_dir_len = strlen (multi_dir);
+      if (multi_os_dir)
+        multi_os_dir_len = strlen (multi_os_dir);
+      suffix_len = strlen (multi_suffix);
+      just_suffix_len = strlen (just_multi_suffix);
+
+      if (path == NULL)
+        {
+          len = paths->max_len + extra_space + 1;
+          if (suffix_len > multi_os_dir_len)
+            len += suffix_len;
+          else
+            len += multi_os_dir_len;
+          path = xmalloc (len);
+        }
 
-      if (machine_suffix
-          && (! check_dir_p
-              || is_directory (pprefix->prefix, machine_suffix, 0)))
+      for (pl = paths->plist; pl != 0; pl = pl->next)
         {
-          if (!first_time)
-            obstack_1grow (&collect_obstack, PATH_SEPARATOR);
+          len = strlen (pl->prefix);
+          memcpy (path, pl->prefix, len);
 
-          first_time = FALSE;
-          obstack_grow (&collect_obstack, pprefix->prefix, len);
-          obstack_grow (&collect_obstack, machine_suffix, suffix_len);
-        }
+          /* Look first in MACHINE/VERSION subdirectory.  */
+          if (!skip_multi_dir)
+            {
+              memcpy (path + len, multi_suffix, suffix_len + 1);
+              ret = callback (path, callback_info);
+              if (ret)
+                break;
+            }
 
-      if (just_machine_suffix
-          && pprefix->require_machine_suffix == 2
-          && (! check_dir_p
-              || is_directory (pprefix->prefix, just_machine_suffix, 0)))
-        {
-          if (! first_time)
-            obstack_1grow (&collect_obstack, PATH_SEPARATOR);
+          /* Some paths are tried with just the machine (ie. target)
+             subdir.  This is used for finding as, ld, etc.  */
+          if (!skip_multi_dir
+              && pl->require_machine_suffix == 2)
+            {
+              memcpy (path + len, just_multi_suffix, just_suffix_len + 1);
+              ret = callback (path, callback_info);
+              if (ret)
+                break;
+            }
+
+          /* Now try the base path.  */
+          if (!pl->require_machine_suffix
+              && !(pl->os_multilib ? skip_multi_os_dir : skip_multi_dir))
+            {
+              const char *this_multi;
+              size_t this_multi_len;
+
+              if (pl->os_multilib)
+                {
+                  this_multi = multi_os_dir;
+                  this_multi_len = multi_os_dir_len;
+                }
+              else
+                {
+                  this_multi = multi_dir;
+                  this_multi_len = multi_dir_len;
+                }
 
-          first_time = FALSE;
-          obstack_grow (&collect_obstack, pprefix->prefix, len);
-          obstack_grow (&collect_obstack, just_machine_suffix,
-                        just_suffix_len);
+              if (this_multi_len)
+                memcpy (path + len, this_multi, this_multi_len + 1);
+              else
+                path[len] = '\0';
+
+              ret = callback (path, callback_info);
+              if (ret)
+                break;
+            }
         }
+      if (pl)
+        break;
 
-      if (! pprefix->require_machine_suffix)
-        {
-          if (! first_time)
-            obstack_1grow (&collect_obstack, PATH_SEPARATOR);
+      if (multi_dir == NULL && multi_os_dir == NULL)
+        break;
 
-          first_time = FALSE;
-          obstack_grow (&collect_obstack, pprefix->prefix, len);
+      /* Run through the paths again, this time without multilibs.
+         Don't repeat any we have already seen.  */
+      if (multi_dir)
+        {
+          free ((char *) multi_dir);
+          multi_dir = NULL;
+          free ((char *) multi_suffix);
+          multi_suffix = machine_suffix;
+          free ((char *) just_multi_suffix);
+          just_multi_suffix = just_machine_suffix;
+        }
+      else
+        skip_multi_dir = true;
+      if (multi_os_dir)
+        {
+          free ((char *) multi_os_dir);
+          multi_os_dir = NULL;
         }
+      else
+        skip_multi_os_dir = true;
     }
 
+  if (multi_dir)
+    {
+      free ((char *) multi_dir);
+      free ((char *) multi_suffix);
+      free ((char *) just_multi_suffix);
+    }
+  if (multi_os_dir)
+    free ((char *) multi_os_dir);
+  if (ret != path)
+    free (path);
+  return ret;
+}
+
+/* Callback for build_search_list.  Adds path to obstack being built.  */
+
+struct add_to_obstack_info {
+  struct obstack *ob;
+  bool check_dir;
+  bool first_time;
+};
+
+static void *
+add_to_obstack (char *path, void *data)
+{
+  struct add_to_obstack_info *info = data;
+
+  if (info->check_dir && !is_directory (path, false))
+    return NULL;
+
+  if (!info->first_time)
+    obstack_1grow (info->ob, PATH_SEPARATOR);
+
+  obstack_grow (info->ob, path, strlen (path));
+
+  info->first_time = false;
+  return NULL;
+}
+
+/* Build a list of search directories from PATHS.
+   PREFIX is a string to prepend to the list.
+   If CHECK_DIR_P is true we ensure the directory exists.
+   If DO_MULTI is true, multilib paths are output first, then
+   non-multilib paths.
+   This is used mostly by putenv_from_prefixes so we use `collect_obstack'.
+   It is also used by the --print-search-dirs flag.  */
+
+static char *
+build_search_list (const struct path_prefix *paths, const char *prefix,
+                   bool check_dir, bool do_multi)
+{
+  struct add_to_obstack_info info;
+
+  info.ob = &collect_obstack;
+  info.check_dir = check_dir;
+  info.first_time = true;
+
+  obstack_grow (&collect_obstack, prefix, strlen (prefix));
+  obstack_1grow (&collect_obstack, '=');
+
+  for_each_path (paths, do_multi, 0, add_to_obstack, &info);
+
   obstack_1grow (&collect_obstack, '\0');
   return XOBFINISH (&collect_obstack, char *);

gcc/system.h

@@ -728 +728 @@
         TARGET_ESC TARGET_FF TARGET_NEWLINE TARGET_TAB TARGET_VT           \
         LINK_LIBGCC_SPECIAL DONT_ACCESS_GBLS_AFTER_EPILOGUE                \
         TARGET_OPTIONS TARGET_SWITCHES EXTRA_CC_MODES FINALIZE_PIC         \
-        PREDICATE_CODES SPECIAL_MODE_PREDICATES HOST_PTR_PRINTF
+        PREDICATE_CODES SPECIAL_MODE_PREDICATES HOST_PTR_PRINTF            \
+        SMALL_ARG_MAX
 
 /* Hooks that are no longer used.  */
  #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE   \