1. Vincenzo Ampolo
  2. gdc

Commits

Iain Buclaw  committed c72727f

Issue #251 - Remove all references to fmultilib-dir usage in gdc spec and patches.

  • Participants
  • Parent commits c46d100
  • Branches default

Comments (0)

Files changed (8)

File d/lang-specs.h

View file
 {".di", "@d", 0, 1, 0 },
 {".DI", "@d", 0, 1, 0 },
 {"@d",
-     "%{!E:cc1d %i %(cc1_options) %(cc1d) %I %N %{nostdinc*} %{+e*} %{I*} %{J*}\
+     "%{!E:cc1d %i %(cc1_options) %(cc1d) %I %{nostdinc*} %{+e*} %{I*} %{J*}\
       %{M} %{MM} %{!fsyntax-only:%(invoke_as)}}", D_D_SPEC, 1, 0 },
 #else
 {".d", "@d", 0, 1, 0 },
 {".di", "@d", 0, 1, 0 },
 {".DI", "@d", 0, 1, 0 },
 {"@d",
-     "%{!E:cc1d %i %(cc1_options) %(cc1d) %I %N %{nostdinc*} %{+e*} %{I*} %{J*}\
+     "%{!E:cc1d %i %(cc1_options) %(cc1d) %I %{nostdinc*} %{+e*} %{I*} %{J*}\
       %{M} %{MM} %{!fsyntax-only:%(invoke_as)}}", D_D_SPEC, 1, 0 },
 #endif
 

File d/patches/patch-apple-gcc-5465

View file
      to the calling program.  */
   static int pass_exit_codes;
 ***************
-*** 487,492 ****
---- 490,496 ----
-  	assembler has done its job.
-   %D	Dump out a -L option for each directory in startfile_prefixes.
-  	If multilib_dir is set, extra entries are generated with it affixed.
-+  %N     Output the currently selected multilib directory name.
-   %l     process LINK_SPEC as a spec.
-   %L     process LIB_SPEC as a spec.
-   %G     process LIBGCC_SPEC as a spec.
-***************
 *** 3975,3980 ****
 --- 3981,3989 ----
   	}
     switches[n_switches].part1 = 0;
     infiles[n_infiles].name = 0;
   }
-***************
-*** 5448,5453 ****
---- 5469,5485 ----
-  	      return value;
-  	    break;
-  
-+ 	  case 'N':
-+ 	    if (multilib_dir)
-+ 	      {
-+ 		arg_going = 1;
-+ 		obstack_grow (&obstack, "-fmultilib-dir=",
-+ 			      strlen ("-fmultilib-dir="));
-+ 	        obstack_grow (&obstack, multilib_dir,
-+ 			      strlen (multilib_dir));
-+ 	      }
-+ 	    break;
-+ 
-  	    /* Here we define characters other than letters and digits.  */
-  
-  	  case '{':
 diff -cr gcc.orig/gcc.h gcc/gcc.h
 *** gcc.orig/gcc.h	2005-03-04 20:17:11.000000000 +0000
 --- gcc/gcc.h	2010-10-27 17:11:22.472795001 +0100

File d/patches/patch-apple-gcc-5664

View file
      to the calling program.  */
   static int pass_exit_codes;
 ***************
-*** 473,478 ****
---- 476,482 ----
-  	assembler has done its job.
-   %D	Dump out a -L option for each directory in startfile_prefixes.
-  	If multilib_dir is set, extra entries are generated with it affixed.
-+  %N     Output the currently selected multilib directory name.
-   %l     process LINK_SPEC as a spec.
-   %L     process LIB_SPEC as a spec.
-   %G     process LIBGCC_SPEC as a spec.
-***************
 *** 4095,4100 ****
 --- 4101,4109 ----
   	}
     switches[n_switches].part1 = 0;
     infiles[n_infiles].name = 0;
   }
-***************
-*** 5528,5533 ****
---- 5549,5565 ----
-  	      return value;
-  	    break;
-  
-+ 	  case 'N':
-+ 	    if (multilib_dir)
-+ 	      {
-+ 		arg_going = 1;
-+ 		obstack_grow (&obstack, "-fmultilib-dir=",
-+ 			      strlen ("-fmultilib-dir="));
-+ 		obstack_grow (&obstack, multilib_dir,
-+ 			      strlen (multilib_dir));
-+ 	      }
-+ 	    break;
-+ 
-  	    /* Here we define characters other than letters and digits.  */
-  
-  	  case '{':
 diff -cr gcc.orig/gcc.h gcc/gcc.h
 *** gcc.orig/gcc.h	2008-05-27 23:39:57.000000000 +0100
 --- gcc/gcc.h	2010-10-27 18:46:24.452795001 +0100

File d/patches/patch-gcc-4.2.x

View file
  /* Flag saying to pass the greatest exit code returned by a sub-process
     to the calling program.  */
  static int pass_exit_codes;
-@@ -461,6 +464,7 @@ or with constant text in a single argume
- 	assembler has done its job.
-  %D	Dump out a -L option for each directory in startfile_prefixes.
- 	If multilib_dir is set, extra entries are generated with it affixed.
-+ %N     Output the currently selected multilib directory name.
-  %l     process LINK_SPEC as a spec.
-  %L     process LIB_SPEC as a spec.
-  %G     process LIBGCC_SPEC as a spec.
 @@ -3927,6 +3931,9 @@ warranty; not even for MERCHANTABILITY o
  	}
      }
    switches[n_switches].part1 = 0;
    infiles[n_infiles].name = 0;
  }
-@@ -5197,6 +5216,17 @@ do_spec_1 (const char *spec, int inswitc
- 	      return value;
- 	    break;
- 
-+	  case 'N':
-+	    if (multilib_dir)
-+	      {
-+		arg_going = 1;
-+		obstack_grow (&obstack, "-fmultilib-dir=",
-+			      strlen ("-fmultilib-dir="));
-+	        obstack_grow (&obstack, multilib_dir,
-+			      strlen (multilib_dir));
-+	      }
-+	    break;
-+
- 	    /* Here we define characters other than letters and digits.  */
- 
- 	  case '{':
 --- gcc.orig/gcc.h	2007-09-01 16:28:30.000000000 +0100
 +++ gcc/gcc.h	2011-07-24 13:34:44.020109066 +0100
 @@ -37,7 +37,7 @@ struct spec_function

File d/patches/patch-gcc-4.3.x

View file
  
  /* The Specs Language
  
-@@ -472,6 +478,7 @@ or with constant text in a single argume
- 	assembler has done its job.
-  %D	Dump out a -L option for each directory in startfile_prefixes.
- 	If multilib_dir is set, extra entries are generated with it affixed.
-+ %N     Output the currently selected multilib directory name.
-  %l     process LINK_SPEC as a spec.
-  %L     process LIB_SPEC as a spec.
-  %G     process LIBGCC_SPEC as a spec.
 @@ -3974,6 +3981,9 @@ warranty; not even for MERCHANTABILITY o
  	}
      }
    switches[n_switches].part1 = 0;
    infiles[n_infiles].name = 0;
  }
-@@ -5240,6 +5262,17 @@ do_spec_1 (const char *spec, int inswitc
- 	      return value;
- 	    break;
- 
-+	  case 'N':
-+	    if (multilib_dir)
-+	      {
-+		arg_going = 1;
-+		obstack_grow (&obstack, "-fmultilib-dir=",
-+			      strlen ("-fmultilib-dir="));
-+	        obstack_grow (&obstack, multilib_dir,
-+			      strlen (multilib_dir));
-+	      }
-+	    break;
-+
- 	    /* Here we define characters other than letters and digits.  */
- 
- 	  case '{':
 --- gcc.orig/gcc.h	2010-08-20 18:07:18.548356656 +0100
 +++ gcc/gcc.h	2010-08-20 18:08:06.540492593 +0100
 @@ -37,7 +37,7 @@ struct spec_function

File d/patches/patch-gcc-4.4.x

View file
  /* Flag saying to pass the greatest exit code returned by a sub-process
     to the calling program.  */
  static int pass_exit_codes;
-@@ -480,6 +483,7 @@ or with constant text in a single argume
- 	assembler has done its job.
-  %D	Dump out a -L option for each directory in startfile_prefixes.
- 	If multilib_dir is set, extra entries are generated with it affixed.
-+ %N     Output the currently selected multilib directory name
-  %l     process LINK_SPEC as a spec.
-  %L     process LIB_SPEC as a spec.
-  %G     process LIBGCC_SPEC as a spec.
 @@ -4022,6 +4026,9 @@ warranty; not even for MERCHANTABILITY o
  	}
      }
    switches[n_switches].part1 = 0;
    infiles[n_infiles].name = 0;
  }
-@@ -5337,6 +5356,17 @@ do_spec_1 (const char *spec, int inswitc
- 	      return value;
- 	    break;
- 
-+	  case 'N':
-+	    if (multilib_dir)
-+	      {
-+		arg_going = 1;
-+		obstack_grow (&obstack, "-fmultilib-dir=",
-+			      strlen ("-fmultilib-dir="));
-+		obstack_grow (&obstack, multilib_dir,
-+			      strlen (multilib_dir));
-+	      }
-+	    break;
-+
- 	    /* Here we define characters other than letters and digits.  */
- 
- 	  case '{':
 --- gcc.orig/gimple.h	2011-07-12 22:58:59.412154189 +0100
 +++ gcc/gimple.h	2011-07-12 23:19:01.138113222 +0100
 @@ -65,7 +65,7 @@ extern void gimple_check_failed (const_g

File d/patches/patch-gcc-4.5.x

View file
  /* Flag saying to pass the greatest exit code returned by a sub-process
     to the calling program.  */
  static int pass_exit_codes;
-@@ -515,6 +518,7 @@ or with constant text in a single argume
- 	assembler has done its job.
-  %D	Dump out a -L option for each directory in startfile_prefixes.
- 	If multilib_dir is set, extra entries are generated with it affixed.
-+ %N	Output the currently selected multilib directory name
-  %l     process LINK_SPEC as a spec.
-  %L     process LIB_SPEC as a spec.
-  %G     process LIBGCC_SPEC as a spec.
 @@ -4282,6 +4286,9 @@ process_command (int argc, const char **
        save_temps_prefix = NULL;
      }
    switches[n_switches].part1 = 0;
    infiles[n_infiles].name = 0;
  }
-@@ -5809,6 +5828,17 @@ do_spec_1 (const char *spec, int inswitc
- 	      return value;
- 	    break;
- 
-+	  case 'N':
-+	    if (multilib_dir)
-+	      {
-+		arg_going = 1;
-+		obstack_grow (&obstack, "-fmultilib-dir=",
-+			      strlen ("-fmultilib-dir="));
-+		obstack_grow (&obstack, multilib_dir,
-+			      strlen (multilib_dir));
-+	      }
-+	    break;
-+
- 	    /* Here we define characters other than letters and digits.  */
- 
- 	  case '{':
 --- gcc.orig/ira.c	2010-09-09 14:55:35.000000000 +0100
 +++ gcc/ira.c	2011-04-25 02:26:12.763181215 +0100
 @@ -1440,7 +1440,7 @@ ira_setup_eliminable_regset (void)

File d/patches/patch-gcc-4.6.x

View file
  /* Definition of string containing the arguments given to configure.  */
  #include "configargs.h"
  
-@@ -373,6 +376,7 @@ or with constant text in a single argume
- 	assembler has done its job.
-  %D	Dump out a -L option for each directory in startfile_prefixes.
- 	If multilib_dir is set, extra entries are generated with it affixed.
-+ %N	Output the currently selected multilib directory name.
-  %l     process LINK_SPEC as a spec.
-  %L     process LIB_SPEC as a spec.
-  %G     process LIBGCC_SPEC as a spec.
 @@ -3925,6 +3929,18 @@ process_command (unsigned int decoded_op
        add_infile ("help-dummy", "c");
      }
    alloc_switch ();
    switches[n_switches].part1 = 0;
    alloc_infile ();
-@@ -5095,6 +5111,17 @@ do_spec_1 (const char *spec, int inswitc
- 	      return value;
- 	    break;
- 
-+          case 'N':
-+	    if (multilib_dir)
-+	      {
-+		arg_going = 1;
-+		obstack_grow (&obstack, "-fmultilib-dir=",
-+			      strlen ("-fmultilib-dir="));
-+		obstack_grow (&obstack, multilib_dir,
-+			      strlen (multilib_dir));
-+	      }
-+	    break;
-+
- 	    /* Here we define characters other than letters and digits.  */
- 
- 	  case '{':
 --- gcc.orig/ira.c	2011-03-08 15:51:12.000000000 +0000
 +++ gcc/ira.c	2011-07-12 23:04:12.433706377 +0100
 @@ -1341,7 +1341,7 @@ ira_setup_eliminable_regset (void)