Ticket #6379: gcc4archiving.patch

src/kits/support/Archivable.cpp

@@ -57 +57 @@
 
     out = "";
 
+#if __GNUC__ >= 4
+    if (name[0] == 'N')
+        name++;
+    int nameLen;
+    bool first = true;
+    while ((nameLen = strtoul(name, (char**)&name, 10))) {
+        if (!first)
+            out += "::";
+        else
+            first = false;
+        out.Append(name, nameLen);
+        name += nameLen;
+    }
+    if (first)
+        return B_BAD_VALUE;
+
+#else
     if (name[0] == 'Q') {
         // The name is in a namespace
         int namespaceCount = 0;
@@ -87 +104 @@
 
     int nameLength = strtoul(name, (char**)&name, 10);
     out.Append(name, nameLength);
+#endif
 
     return B_OK;
 }
@@ -116 +134 @@
     }
 
     //  Now mangle it into this:
+    //      9testthree8testfour9Testthree8Testfour
+    //          (for __GNUC__ > 2)
+    //          this isn't always the proper mangled class name, it should
+    //          actually have an 'N' prefix and 'E' suffix if the name is
+    //          in > 0 namespaces, but these would have to be removed in
+    //          build_function_name() (the only place this function is called)
+    //          so we don't add them.
+    //  or this:
     //      Q49testthree8testfour9Testthree8Testfour
+    //          (for __GNUC__ == 2)
+
     out = "";
+#if __GNUC__ == 2
     if (count > 1) {
         out += 'Q';
         if (count > 10)
@@ -126 +155 @@
         if (count > 10)
             out += '_';
     }
+#endif
 
     for (unsigned int i = 0; i < spacenames.size(); ++i) {
         out << (int)spacenames[i].length();