Changeset 2814 for branches/libc-0.6/src/gcc

Timestamp:

Sep 10, 2006, 1:58:27 AM (19 years ago)

Author:

bird

Message:

Link libstdc++ into the libc dll. Fixes #124.

Location:

branches/libc-0.6/src/gcc/gcc

Files:

• config/i386/emx-libgcc_so_d.def (modified) (1 diff)
• config/i386/emx.h (modified) (1 diff)
• cp/g++spec.c (modified) (8 diffs)

branches/libc-0.6/src/gcc/gcc/config/i386/emx-libgcc_so_d.def

@@ -1 +1 @@
 ; Auto-generated file, DO NOT EDIT!!! (see libgcc_d.awk) */
-LIBRARY libc06b5 INITINSTANCE TERMINSTANCE
+LIBRARY libc062 INITINSTANCE TERMINSTANCE
 EXPORTS
 EXPORTS

branches/libc-0.6/src/gcc/gcc/config/i386/emx.h

@@ -406 +406 @@
 *-----------------------------------------------------------------------------*/
 
-/* Predefine symbols. */
+/* Use the stdc++ code linked into the libc dll when possible. */
+#define LIBSTDCXX                   "-lc_dll"
+#define LIBSTDCXX_STATIC            "-lstdc++"
+#define LIBSTDCXX_PROFILE           LIBSTDCXX
+#define LIBSTDCXX_PROFILE_STATIC    LIBSTDCXX_STATIC
+
+/* Predefine symbols. 
+   We could possibly move these to an include and use -include here...
+  __KLIBC_VERSION__ = (__KLIBC__ << 24) | (__KLIBC_MINOR__ << 16) | __KLIBC_PATCHLEVEL__
+  __INNOTEK_LIBC__ = __KLIBC__ (legacy) */
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__INNOTEK_LIBC__=0x006"
+#define CPP_PREDEFINES "-D__KLIBC__=0 -D__KLIBC_MINOR__=6 -D__KLIBC_PATCHLEVEL__=2 " \
+                       "-D__KLIBC_VERSION__=0x00060002 " \
+                       "-D__INNOTEK_LIBC__=0x006 "
 
 /* Provide extra args to the C preprocessor and extra switch-translations.  */

branches/libc-0.6/src/gcc/gcc/cp/g++spec.c

@@ -43 +43 @@
 #define LIBSTDCXX_PROFILE "-lstdc++"
 #endif
+#ifdef LIBSTDCXX_STATIC                                                             /* bird */
+#define LIBSTDCXX_STATIC "-lstdc++"                                                 /* bird */
+#endif                                                                              /* bird */
+#ifdef LIBSTDCXX_PROFILE_STATIC                                                     /* bird */
+#define LIBSTDCXX_PROFILE_STATIC "-lstdc++"                                         /* bird */
+#endif                                                                              /* bird */
 
 void
@@ -95 +101 @@
   int shared_libgcc = 1;
 
+  /* True if we saw the '-static' option on the commandline. */                     /* bird */
+  int saw_static = 0;                                                               /* bird */
+                                                                                    /* bird */
   /* The total number of arguments with the new stuff.  */
   int argc;
@@ -155 +164 @@
                 {
                   /* If they only gave us `-v', don't try to link
-                     in libg++.  */ 
+                     in libg++.  */
                   library = 0;
                 }
@@ -176 +185 @@
               added -= 2;
             }
-          else if (strcmp (argv[i], "-static-libgcc") == 0 
-                   || strcmp (argv[i], "-static") == 0)
+          else if (strcmp (argv[i], "-static-libgcc") == 0)                             /* bird */
             shared_libgcc = 0;
+          else if (strcmp (argv[i], "-static") == 0)                                /* bird */
+            {                                                                       /* bird */
+              saw_static = 1;                                                       /* bird */
+              shared_libgcc = 0;                                                    /* bird */
+            }                                                                       /* bird */
           else if (DEFAULT_WORD_SWITCH_TAKES_ARG (&argv[i][1]))
             i++;
@@ -187 +200 @@
       else
         {
-          int len; 
+          int len;
 
           if (saw_speclang)
@@ -230 +243 @@
   i = 0;
   j = 0;
-  
+
   /* Copy the 0th argument, i.e., the name of the program itself.  */
   arglist[i++] = argv[j++];
@@ -273 +286 @@
   if (library)
     {
-      arglist[j++] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX;
+      arglist[j++] = saw_profile_flag                                               /* bird */
+                   ? saw_static ? LIBSTDCXX_PROFILE_STATIC : LIBSTDCXX_PROFILE      /* bird */
+                   : saw_static ? LIBSTDCXX_STATIC : LIBSTDCXX;                     /* bird */
       added_libraries++;
 #ifdef USE_LIBUNWIND_EXCEPTIONS
@@ -311 +326 @@
 int lang_specific_extra_outfiles = 0;  /* Not used for C++.  */
 
-/* Table of language-specific spec functions.  */ 
+/* Table of language-specific spec functions.  */
 const struct spec_function lang_specific_spec_functions[] =
 {