Changeset 3921 for branches/libc-0.6

Timestamp:

Oct 25, 2014, 7:34:31 PM (11 years ago)

Author:

bird

Message:

0.6: gcc/gcc.c: Backported r101934 and r101993 and applied fix from komh regarding language == NULL by default. Fixes #319.

Location:

branches/libc-0.6/src/gcc/gcc

Files:

• gcc.c (modified) (2 diffs)
• version.c (modified) (1 diff)

branches/libc-0.6/src/gcc/gcc/gcc.c

@@ -2877 +2877 @@
 static int n_switches;
 
+/* Language is one of three things:
+
+   1) The name of a real programming language.
+   2) NULL, indicating that no one has figured out
+   what it is yet.
+   3) '*', indicating that the file should be passed
+   to the linker.  */
 struct infile
 {
@@ -6398 +6405 @@
     }
 
-  /* Reset the output file name to the first input file name, for use
-     with %b in LINK_SPEC on a target that prefers not to emit a.out
-     by default.  */
+  /* Reset the input file name to the first compile/object file name, for use
+     with %b in LINK_SPEC. We use the first input file that we can find
+     a compiler to compile it instead of using infiles.language since for 
+     languages other than C we use aliases that we then lookup later.  */
   if (n_infiles > 0)
-    set_input (infiles[0].name);
+    {
+      int i;
+
+      for (i = 0; i < n_infiles ; i++)
+        if (!infiles[i].language || infiles[i].language[0] != '*')
+          {
+            set_input (infiles[i].name);
+            break;
+          }
+    }
 
   if (error_count == 0)

branches/libc-0.6/src/gcc/gcc/version.c

@@ -7 +7 @@
    organization's name in parentheses at the end of the string.  */
 
-const char version_string[] = "3.3.5";
+const char version_string[] = "3.3.5 (Bird Build 2012-03-22 22:01 (csd4))";
 
 /* This is the location of the online document giving instructions for