Changeset 513

Timestamp:

Aug 2, 2003, 11:13:25 AM (22 years ago)

Author:

zap

Message:

Some fixes.

Location:

trunk/src/gcc/gcc/config/i386

Files:

• emx-dllinit.c (modified) (3 diffs, 1 prop)
• emx-eh.c (modified) (3 diffs, 1 prop)
• emx.h (modified) (1 diff, 1 prop)
• xm-emx.h (modified) (3 diffs, 1 prop)

trunk/src/gcc/gcc/config/i386/emx-dllinit.c

@@ -1 @@
-/* This is the startup code for gcc.dll it should not be exposed to anyone 
-   else as we don't wanna have duplicate startup code around. The right 
-   startup code is in libc.
-   
-   */
+/* This is the startup code for GCC version-specific runtime dll.
+   It should not be exposed to anyone else as we don't wanna have
+   duplicate startup code around. The right startup code is in libc. */
 
 extern int _CRT_init (void);
@@ -9 +7 @@
 extern void __ctordtorTerm (void);
 extern void __ehInitDLL (void);
-/* #pragma weak __ehInitDLL - ld crashing on #pragma weak __ehInitDLL. */
 extern void __ehTermDLL (void);
-/* #pragma weak __ehTermDLL - ld crashing on #pragma weak __ehTermDLL. */
 
 unsigned long _System _DLL_InitTerm (unsigned long mod_handle, unsigned long flag)
@@ -20 +16 @@
       if (_CRT_init () != 0)
         break;
-      /*if (__ehInitDLL)*/
-        __ehInitDLL ();
+      __ehInitDLL ();
       __ctordtorInit ();
       return 1;
     case 1:
       __ctordtorTerm ();
-      /*if (__ehTermDLL)*/
-        __ehTermDLL ();
+      __ehTermDLL ();
       return 1;
   }

trunk/src/gcc/gcc/config/i386/emx-eh.c

@@ -6 +6 @@
 extern void __register_frame_table (void *begin);
 extern void __deregister_frame (void *begin);
-extern int  atexit(void (*f)());
-
+extern int atexit(void (*f)());
 
 /** Exception handler stuff init indicator. 0 means not inited, 1 means inited. */
 static int inited;
-
-extern void __ehTermDLL (void);
-extern void __ehInitDLL (void);
-extern void __ehInit (void);
-static void __ehTerm (void);
-
 
 /**
@@ -46 +39 @@
 }
 
-
 /**
- * atexit() procedure used pto terminate exception stuff in programs.
+ * atexit() procedure used to terminate exception stuff in programs.
  * Registered by __ehInit.
  */
 static void __ehTerm (void)
 {
-  __ehTermDLL();
+  __ehTermDLL ();
 }
 
@@ -65 +57 @@
     {
       atexit (__ehTerm);
-      __ehInitDLL();
+      __ehInitDLL ();
     }
 }
-

trunk/src/gcc/gcc/config/i386/emx.h

@@ -253 +253 @@
  *
  *                            - S - P - E - C - S -
- *                            - S - P - E - C - S -
- *                            - S - P - E - C - S -
  *
  *

trunk/src/gcc/gcc/config/i386/xm-emx.h

@@ -30 +30 @@
 
 #ifndef CROSS_COMPILE
-
-#define TOOLDIR_BASE_PREFIX             "/gcc/"
-#define STANDARD_BINDIR_PREFIX          "/gcc/bin/"
-#define STANDARD_STARTFILE_PREFIX       "/gcc/lib/"
-#define STANDARD_EXEC_PREFIX            "/gcc/lib/gcc-lib/"
+#undef LOCAL_INCLUDE_DIR
+#undef CROSS_INCLUDE_DIR
+#undef TOOL_INCLUDE_DIR
+#undef STANDARD_INCLUDE_DIR
 #define STANDARD_INCLUDE_DIR            "/gcc/include/"
-#define STANDARD_INCLUDE_COMPONENT      "GCC"
-#define LOCAL_INCLUDE_DIR               "/gcc/local/include"
-#define LOCAL_INCLUDE_COMPONENT         "GCC"
-
-#define GCC_INCLUDE_DIR                 "/gcc/lib/gcc-lib/i386-pc-os2-emx/3.2.2/include"
-#define GPLUSPLUS_INCLUDE_DIR           "/gcc/include/c++/3.2.2"
-#define GPLUSPLUS_TOOL_INCLUDE_DIR      "/gcc/include/c++/3.2.2/i386-pc-os2-emx"
-#define GPLUSPLUS_BACKWARD_INCLUDE_DIR  "/gcc/include/c++/3.2.2/backward"
-
-#undef CROSS_INCLUDE_DIR
+#define STANDARD_INCLUDE_COMPONENT      "GCC"
+#undef LOCAL_INCLUDE_DIR
 #undef PREFIX_INCLUDE_DIR
+#undef TOOL_INCLUDE_DIR
 #undef SYSTEM_INCLUDE_DIR
-#undef TOOL_INCLUDE_DIR
-
 #endif /* not CROSS_COMPILE */
 
@@ -119 +109 @@
         const char *arg [4];                                                   \
         arg [0] = argv [i];                                                    \
-        if (!strcmp (argv [i], "-Zmts"))                                       \
-          {                                                                    \
-            arg [0] = "-Zmt";                                                  \
-            arg [1] = "-static";                                               \
-            arg_count = 2;                                                     \
-          }                                                                    \
-        else if (!strcmp (argv [i], "-Zmtd"))                                  \
-          {                                                                    \
-            arg [0] = "-Zmt";                                                  \
-            arg [1] = "-Zcrtdll=c_dll";                                        \
-            arg_count = 2;                                                     \
-          }                                                                    \
-        else if (!strcmp (argv [i], "-Zcrtdll"))                               \
-            arg [0] = "-Zcrtdll=c_dll";                                        \
+        if (!strcmp (argv [i], "-Zcrtdll"))                                    \
+          arg [0] = "-Zcrtdll=c_dll";                                          \
         else if (!strcmp (argv [i], "-Zlinker"))                               \
           {                                                                    \
@@ -150 +128 @@
       }                                                                        \
     argv = new_argv; argc = new_argc;                                          \
-    EMX_INITIALIZE_ENVIRONMENT(2)                                                      \
+    EMX_INITIALIZE_ENVIRONMENT(2)                                              \
   }