Changeset 44

Timestamp:

Apr 28, 2003, 2:39:53 PM (23 years ago)

Author:

bird

Message:

Patches from Andy.

Location:

trunk/src/gcc/gcc

Files:

• config/i386/emx.c (modified) (4 diffs, 1 prop)
• config/i386/emx.h (modified) (5 diffs, 1 prop)
• config/i386/t-emx (modified) (1 diff, 1 prop)
• config/i386/xm-emx.h (modified) (2 diffs, 1 prop)
• emx-nextstage (modified) (2 diffs, 1 prop)

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

@@ -136 +136 @@
 }
 
-/* Return string which is the former assembler name modified with a 
-   suffix consisting of an atsign (@) followed by the number of bytes of 
+/* Return string which is the former assembler name modified with a
+   suffix consisting of an atsign (@) followed by the number of bytes of
    arguments */
 
@@ -151 +151 @@
 
   if (TYPE_ARG_TYPES (TREE_TYPE (decl)))
-    if (TREE_VALUE (tree_last (TYPE_ARG_TYPES (TREE_TYPE (decl)))) 
+    if (TREE_VALUE (tree_last (TYPE_ARG_TYPES (TREE_TYPE (decl))))
         == void_type_node)
       {
@@ -174 +174 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
 /* Cover function to implement ENCODE_SECTION_INFO.  */
 
@@ -191 +203 @@
     if (lookup_attribute ("stdcall",
                           TYPE_ATTRIBUTES (TREE_TYPE (decl))))
-      XEXP (DECL_RTL (decl), 0) = 
+      XEXP (DECL_RTL (decl), 0) =
         gen_rtx (SYMBOL_REF, Pmode, gen_stdcall_suffix (decl));
-}
+    else if (lookup_attribute ("optlink",
+                               TYPE_ATTRIBUTES (TREE_TYPE (decl)))
+             || lookup_attribute ("system",
+                                  TYPE_ATTRIBUTES (TREE_TYPE (decl))))
+      XEXP (DECL_RTL (decl), 0) =
+        gen_rtx (SYMBOL_REF, Pmode, emx_remove_underscore (decl));
+}

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

@@ -173 +173 @@
     if ((LOG)!=0) fprintf ((FILE), "\t.align %d\n", LOG)
 
+
+
+
+
+
+
+
+
+
+
+
 /* Define this macro if references to a symbol must be treated
    differently depending on something about the variable or
@@ -179 +190 @@
 #define ENCODE_SECTION_INFO(DECL) emx_encode_section_info (DECL)
 extern void emx_encode_section_info PARAMS ((tree));
-
-/* Utility used only in this file.  */
-#define EMX_STRIP_ENCODING(SYM_NAME)                                    \
-  ((SYM_NAME) + ((SYM_NAME)[0] == '@' ?                                 \
-    ((SYM_NAME)[3] == '*' ? 4 : 3) : 0) + ((SYM_NAME)[0] == '*' ? 1 : 0))
 
 /* This macro gets just the user-specified name
@@ -192 +198 @@
 do {                                                                    \
   const char *_p;                                                       \
-  const char *_name = EMX_STRIP_ENCODING (SYMBOL_NAME);                 \
+  const char *_name = SYMBOL_NAME;                                      \
+  if (*_name == '\b') _name++;                                          \
   for (_p = _name; *_p && *_p != '@'; ++_p)                             \
     ;                                                                   \
@@ -210 +217 @@
 #undef ASM_OUTPUT_LABELREF
 #define ASM_OUTPUT_LABELREF(STREAM, NAME)                               \
-  fprintf (STREAM, "%s%s", USER_LABEL_PREFIX,                           \
-           EMX_STRIP_ENCODING (NAME))
+  fprintf (STREAM, "%s%s",       \
+)
 
 /* Handle _optlink attributes */
@@ -244 +251 @@
 #define RETURN_POPS_ARGS(FUNDECL,FUNTYPE,SIZE)                          \
     (emx_return_pops_args (FUNDECL, FUNTYPE, SIZE))
-
-/******************************************************************************
- *                             - P - A - T - H - S -
- ******************************************************************************/
-
-#ifndef CROSS_COMPILE
-#undef TOOLDIR_BASE_PREFIX
-#define TOOLDIR_BASE_PREFIX             "/gcc/"
-#undef STANDARD_BINDIR_PREFIX
-#define STANDARD_BINDIR_PREFIX          "/gcc/bin/"
-#undef STANDARD_STARTFILE_PREFIX
-#define STANDARD_STARTFILE_PREFIX       "/gcc/lib/"
-#undef STANDARD_EXEC_PREFIX
-#define STANDARD_EXEC_PREFIX            "/gcc/lib/gcc-lib/"
-
-#define GCC_INCLUDE_DIR                 "/gcc/include/"
-#undef STANDARD_INCLUDE_DIR
-#define STANDARD_INCLUDE_DIR            "/gcc/include/"
-#define STANDARD_INCLUDE_COMPONENT      "GCC"
-#undef LOCAL_INCLUDE_DIR
-#undef PREFIX_INCLUDE_DIR
-#undef TOOL_INCLUDE_DIR
-#undef SYSTEM_INCLUDE_DIR
-#endif /* not CROSS_COMPILE */
-
-/* for prefix.c */
-#define UPDATE_PATH_HOST_CANONICALIZE(path)                                    \
-{                                                                              \
-  char prefix_buffer [260 + 1], *c;                                            \
-  _abspath (prefix_buffer, path, sizeof (prefix_buffer));                      \
-  free (path);                                                                 \
-  /* Way too often gcc generates double slashes, it looks bad */               \
-  for (c = prefix_buffer; *c; c++)                                             \
-    if ((c [0] == '/') && (c [1] == '/'))                                      \
-      memmove (c, c + 1, strlen (c));                                          \
-  path = xstrdup (prefix_buffer);                                              \
-}
-
-#define EMX_INITIALIZE_ENVIRONMENT(taildirs)                                   \
-  /* Add the GCC_ROOT and BINUTILS_ROOT env vars if they don't exist */        \
-  if (!getenv ("GCC_ROOT") || !getenv ("G++_ROOT") || !getenv ("BINUTILS_ROOT"))\
-    {                                                                          \
-      char buffer [14 + 260 + 1];                                              \
-      if (!_execname (buffer + 14, sizeof (buffer) - 14))                      \
-      {                                                                        \
-        int i;                                                                 \
-        for (i = 0; i < taildirs; i++)                                         \
-          {                                                                    \
-            char *name = _getname (buffer + 14);                               \
-            if (name > buffer + 14)                                            \
-              {                                                                \
-                if (i < taildirs - 1) name--;                                  \
-                if (*name != ':') *name = 0;                                   \
-              }                                                                \
-          }                                                                    \
-        if (!getenv ("GCC_ROOT"))                                              \
-          {                                                                    \
-            memcpy (buffer + 5, "GCC_ROOT=", 9);                               \
-            putenv (xstrdup (buffer + 5));                                     \
-          }                                                                    \
-        if (!getenv ("G++_ROOT"))                                              \
-          {                                                                    \
-            memcpy (buffer + 5, "G++_ROOT=", 9);                               \
-            putenv (xstrdup (buffer + 5));                                     \
-          }                                                                    \
-        if (!getenv ("BINUTILS_ROOT"))                                         \
-          {                                                                    \
-            memcpy (buffer, "BINUTILS_ROOT=", 14);                             \
-            putenv (xstrdup (buffer));                                         \
-          }                                                                    \
-      }                                                                        \
-    }
-
-/* emxomf does not understand stabs+, so for frontends we have to
-   switch to standard stabs if -Zomf is used. We also do many other
-   argv preprocessing here. */
-#define GCC_DRIVER_HOST_INITIALIZATION                                         \
-  {                                                                            \
-    int i, j, new_argc, max_argc, omf = 0, g_found = 0;                        \
-    const char **new_argv;                                                     \
-    _emxload_env ("GCCLOAD");                                                  \
-    _envargs (&argc, (char ***)&argv, "GCCOPT");                               \
-    _response (&argc, (char ***)&argv);                                        \
-    _wildcard (&argc, (char ***)&argv);                                        \
-    /* Copy argv into a new location and modify it while copying */            \
-    new_argv = (const char **)malloc ((max_argc = argc) * sizeof (char *));    \
-    new_argv [0] = argv [0];                                                   \
-    for (i = 1, new_argc = 1; i < argc; i++)                                   \
-      {                                                                        \
-        int arg_count = 1;                                                     \
-        const char *arg [4];                                                   \
-        arg [0] = argv [i];                                                    \
-        if (!strcmp (argv [i], "-Zomf"))                                       \
-          omf = 1;                                                             \
-        else if (!strncmp (argv [i], "-g", 2)                                  \
-              && ((argv [i][2] == 0) || ISDIGIT (argv [i][2])))                \
-          g_found = new_argc;                                                  \
-        else 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_import";                                     \
-            arg_count = 2;                                                     \
-          }                                                                    \
-        else if (!strcmp (argv [i], "-Zcrtdll"))                               \
-            arg [0] = "-Zcrtdll=c_import";                                     \
-        else if (!strcmp (argv [i], "-Zlinker"))                               \
-          {                                                                    \
-            if (i + 1 >= argc)                                                 \
-                fatal ("argument to `-Zlinker' is missing");                   \
-            arg [0] = "-Xlinker";                                              \
-            arg [1] = "-O";                                                    \
-            arg [2] = "-Xlinker";                                              \
-            arg [3] = argv [++i];                                              \
-            arg_count = 4;                                                     \
-          }                                                                    \
-        if (new_argc + arg_count > max_argc)                                   \
-            new_argv = (const char **)realloc (new_argv,                       \
-                (new_argc + arg_count) * sizeof (char *));                     \
-        for (j = 0; j < arg_count; j++)                                        \
-            new_argv [new_argc++] = arg [j];                                   \
-      }                                                                        \
-    argv = new_argv; argc = new_argc;                                          \
-    if (g_found && omf)                                                        \
-      {                                                                        \
-        char *temp = (char *)malloc (strlen (argv [g_found]) + 5 + 1);         \
-        strcpy (temp, "-gstabs");                                              \
-        strcat (temp, &argv [g_found][2]);                                     \
-        ((char **)argv) [g_found] = temp;                                      \
-      }                                                                        \
-    EMX_INITIALIZE_ENVIRONMENT(2)                                                      \
-  }
 
 /******************************************************************************

trunk/src/gcc/gcc/config/i386/t-emx

@@ -42 +42 @@
 LIB1ASMFUNCS = _alloca _udivdi3 _umoddi3 _divdi3 _moddi3
 
-# Extra functions to add to libgcc (bird: don't forget $(srcdir) prefixing)
-LIB2FUNCS_EXTRA = $(srcdir)/config/i386/emx-ctordtor.c
-LIB2ADDEH = $(srcdir)/config/i386/emx-eh.c $(srcdir)/config/i386/emx-dllinit.c \
-  $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c
+# Extra functions to add to libgcc
+LIB2FUNCS_EXTRA = config/i386/emx-ctordtor.c
+LIB2ADDEH = config/i386/emx-dllinit.c \
+  unwind-sjlj.c
 #LIB2ADDEHDEP
 

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

@@ -24 +24 @@
 /* No block device special files on OS/2 */
 #define S_ISBLK(x) 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /* Do some OS/2-specific work upon initialization of all compilers */
@@ -32 +181 @@
     /* Compilers don't fork (thanks God!) so we can use >32MB RAM */           \
     _uflags (_UF_SBRK_MODEL, _UF_SBRK_ARBITRARY);                              \
-    EMX_INITIALIZE_ENVIRONMENT(4)                                                      \
+    EMX_INITIALIZE_ENVIRONMENT(                                              \
   }
 

trunk/src/gcc/gcc/emx-nextstage

@@ -15 +15 @@
 log='emx-build.log'
 emxload -q
-#export GCCLOAD=
+export GCCLOAD=1
 
 [ -z "$SHELL" ] && SHELL=$BASH
 [ -z "$SHELL" ] && SHELL=sh
+
+
+
+
 
 for stage in 4 3 2 1 0; do
@@ -60 +64 @@
          OLDCC="gcc -O6 -mno-stack-align-double -s" OLDCFLAGS= \
          LOOSE_WARN="-W -Wall -Wwrite-strings -Wstrict-prototypes" \
-         exec_prefix=/emx LANGUAGES="${LANGUAGES}" $* 2>&1 | tee $log
+         exec_prefix= LANGUAGES="${LANGUAGES}" $* 2>&1 | tee $log
 
     if [ $? = 0 ] && [ -f mt/gcc*.dll ]; then
+
+
+
+
       emxload -q
       stage=`expr ${stage} + 1`
       make stage${stage}
+
+
     fi
     break;