Changeset 543

Timestamp:

Aug 7, 2003, 8:39:55 PM (22 years ago)

Author:

zap

Message:

See changelog.

Location:

trunk/src

Files:

• emx/Makefile (modified) (1 diff, 1 prop)
• emx/src/lib/libc.def (modified) (2 diffs, 1 prop)
• emx/src/lib/misc/getegid.c (modified) (1 diff, 1 prop)
• emx/src/lib/misc/geteuid.c (modified) (1 diff, 1 prop)
• emx/src/lib/misc/getgrgid.c (modified) (1 diff, 1 prop)
• gcc/gcc/Makefile.in (modified) (10 diffs, 1 prop)
• gcc/gcc/cfg.sh (modified) (1 diff, 1 prop)
• gcc/gcc/config/i386/emx-dllinit.c (modified) (2 diffs, 1 prop)
• gcc/gcc/config/i386/emx-eh.c (modified) (4 diffs, 1 prop)
• gcc/gcc/config/i386/emx.c (modified) (4 diffs, 1 prop)
• gcc/gcc/config/i386/emx.h (modified) (5 diffs, 1 prop)
• gcc/gcc/config/i386/i386.c (modified) (9 diffs, 1 prop)
• gcc/gcc/config/i386/t-emx (modified) (4 diffs, 1 prop)
• gcc/gcc/configure (modified) (3 diffs, 1 prop)
• gcc/gcc/emx-nextstage (modified) (4 diffs, 1 prop)
• gcc/gcc/function.c (modified) (1 diff, 1 prop)

trunk/src/emx/Makefile

@@ -34 +34 @@
 ifndef GENRULES
 GENRULES = $.genrules.smak
+endif
+
+# Check if MODE has a valid value
+ifneq ($(filter-out /opt/ /dbg/ /prf/,/$(MODE)/),)
+$(error MODE should have one of the following values: opt, dbg, prf)
 endif
 

trunk/src/emx/src/lib/libc.def

@@ -538 +538 @@
     "__getcwd2" @562
     "__getdrive" @563
-    "__getegid" @564
-    "__geteuid" @565
     "__getext" @566
     "__getext2" @567
-    "__getgrgid" @568
     "__getname" @569
     "__getpass1" @570
@@ -804 +801 @@
     "__ea_set_errno" @828
     "__ea_write" @829
-    
+    "__std_getegid" @830
+    "__std_geteuid" @831
+    "__std_getgrgid" @832

trunk/src/emx/src/lib/misc/getegid.c

@@ -5 +5 @@
 #include <sys/types.h>
 
-gid_t _getegid (void)
+gid_t _STD(getegid) (void)
 {
   return 0;

trunk/src/emx/src/lib/misc/geteuid.c

@@ -5 +5 @@
 #include <sys/types.h>
 
-uid_t _geteuid (void)
+uid_t _STD(geteuid) (void)
 {
   return 0;

trunk/src/emx/src/lib/misc/getgrgid.c

@@ -8 +8 @@
 /* Dummy function */
 
-struct group *_getgrgid (gid_t gid)
+struct group *_STD(getgrgid) (gid_t gid)
 {
   static struct group tmp_grp;

trunk/src/gcc/gcc/Makefile.in

@@ -1062 +1062 @@
           CONFIG_H="$(TCONFIG_H)" MACHMODE_H="$(MACHMODE_H)" \
           LIB1ASMSRC='$(LIB1ASMSRC)' \
-          MAKEOVERRIDES= \
+          MAKEOVERRIDES= SHELL=$(SHELL) \
           -f libgcc.mk all
 
@@ -1104 +1104 @@
           CONFIG_H="$(CONFIG_H)" MACHMODE_H="$(MACHMODE_H)" \
           LIB1ASMSRC='$(LIB1ASMSRC)' \
-          MAKEOVERRIDES= \
+          MAKEOVERRIDES= SHELL=$(SHELL) \
           -f libgcc.mk all
         $(STAMP) stmp-multilib
@@ -2779 +2779 @@
           DESTDIR="$(DESTDIR)" \
           libsubdir="$(libsubdir)" \
-          slibdir="$(slibdir)" \
+          slibdir="$(slibdir)" SHELL=$(SHELL) \
           -f libgcc.mk install
 
@@ -2806 +2806 @@
           DESTDIR="$(DESTDIR)" \
           libsubdir="$(libsubdir)" \
-          slibdir="$(slibdir)" \
+          slibdir="$(slibdir)" SHELL=$(SHELL) \
           -f libgcc.mk install
 
@@ -3189 +3189 @@
             && (cmp tmp-foo1 tmp-foo2 > /dev/null 2>&1 || echo $$file differs >> .bad_compare) || true; \
         done
+endif
         case "$@" in compare | compare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^compare\([0-9][0-9]*\).*,\1,'` ;; esac; \
         for dir in tmp-foo intl $(SUBDIRS); do \
@@ -3200 +3201 @@
         done
         -rm -f tmp-foo*
-endif   
         case "$@" in compare | compare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^compare\([0-9][0-9]*\).*,\1,'` ;; esac; \
         if [ -f .bad_compare ]; then \
@@ -3245 +3245 @@
 stage1-start:
         -if [ -d stage1 ] ; then true ; else mkdir stage1 ; fi
-        $(MAKE) -f libgcc.mk libgcc-stage-start stage=stage1
+        $(MAKE) SHELL=$(SHELL) -f libgcc.mk libgcc-stage-start stage=stage1
         -for dir in intl $(SUBDIRS) ; \
          do \
@@ -3274 +3274 @@
 stage2-start:
         -if [ -d stage2 ] ; then true ; else mkdir stage2 ; fi
-        $(MAKE) -f libgcc.mk libgcc-stage-start stage=stage2
+        $(MAKE) SHELL=$(SHELL) -f libgcc.mk libgcc-stage-start stage=stage2
         -for dir in intl $(SUBDIRS) ; \
          do \
@@ -3303 +3303 @@
 stage3-start:
         -if [ -d stage3 ] ; then true ; else mkdir stage3 ; fi
-        $(MAKE) -f libgcc.mk libgcc-stage-start stage=stage3
+        $(MAKE) SHELL=$(SHELL) -f libgcc.mk libgcc-stage-start stage=stage3
         -for dir in intl $(SUBDIRS) ; \
          do \
@@ -3332 +3332 @@
 stage4-start:
         -if [ -d stage4 ] ; then true ; else mkdir stage4 ; fi
-        $(MAKE) -f libgcc.mk libgcc-stage-start stage=stage4
+        $(MAKE) SHELL=$(SHELL) -f libgcc.mk libgcc-stage-start stage=stage4
         -for dir in intl $(SUBDIRS) ; \
          do \

trunk/src/gcc/gcc/cfg.sh

@@ -20 +20 @@
 export LDFLAGS="-s -Zexe -Zcrtdll"
 
+# Many tests will fail if we'll include toolkit's types.h instead of emx's
+unset C_INCLUDE_PATH
+export C_INCLUDE_PATH
+
 export TOPLEVEL_CONFIGURE_ARGUMENTS="--enable-clh --enable-threads --enable-shared --enable-nls --without-included-gettext --prefix=/gcc --srcdir=`pwd`"
 

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

@@ -6 +6 @@
 extern void __ctordtorInit (void);
 extern void __ctordtorTerm (void);
-extern void __ehInitDLL (void);
-extern void __ehTermDLL (void);
 
 unsigned long _System _DLL_InitTerm (unsigned long mod_handle, unsigned long flag)
@@ -16 +14 @@
       if (_CRT_init () != 0)
         break;
-      __ehInitDLL ();
       __ctordtorInit ();
       return 1;
     case 1:
       __ctordtorTerm ();
-      __ehTermDLL ();
       return 1;
   }

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

@@ -1 @@
-/* Called at startup to register frame unwind info tables and at shutdown
-   to deregister FUI tables. Used when frame unwinding info is enabled
-   (C++ without --fno-exceptions and without -fsjlj-exceptions). */
+/* This piece of code is linked into the program from gcc.a if any of the
+   object files that are linked together use exception (e.g. have exception
+   frame tables inside). The code automatically registers all exception
+   tables into a central list (meant to be placed inside gcc*.dll),
+   upon program exit these lists are deregistered. */
 
 extern int __eh_frame__;
 extern void __register_frame_table (void *begin);
 extern void __deregister_frame (void *begin);
-extern int atexit(void (*f)());
 
 /** Exception handler stuff init indicator. 0 means not inited, 1 means inited. */
@@ -15 +16 @@
  * Intended external caller is _DLL_InitTerm.
  */
-void __ehInitDLL (void)
+void __attribute__((constructor)) __ehInit (void)
 {
   if (!inited)
@@ -29 +30 @@
  * Intended external caller is _DLL_InitTerm.
  */
-void __ehTermDLL (void)
+void __attribute__((destructor)) __ehTerm (void)
 {
   if (inited)
@@ -38 +39 @@
     }
 }
-
-/**
- * atexit() procedure used to terminate exception stuff in programs.
- * Registered by __ehInit.
- */
-static void __ehTerm (void)
-{
-  __ehTermDLL ();
-}
-
-/** 
- * Init exception handler stuff for a program.
- * Intended external caller is GCC generated main() code.
- */
-void __ehInit (void)
-{
-  if (!inited)
-    {
-      atexit (__ehTerm);
-      __ehInitDLL ();
-    }
-}

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

@@ -1 +1 @@
 /* emx.c: Functions for emx as target system.
 
-Written by Eberhard Mattes, based on i386.c.
-r=bird: Shouldn't Andy be in here too?
+Original version by Eberhard Mattes, based on i386.c.
+Heavily modified by Andrew Zabolotny and Knut St. Osmundsen.
 
 This file is part of GNU CC.
@@ -36 +36 @@
 #endif
 
-extern int ix86_return_pops_args (tree fundecl, tree funtype, int size);
-
-tree ix86_handle_optlink_attribute (tree *node, tree name, tree args,
+static void (*old_lang_set_decl_assembler_name) (tree decl);
+
+static void emx_lang_set_decl_assembler_name (tree decl)
+{
+  tree id;
+
+  if (lookup_attribute ("optlink", TYPE_ATTRIBUTES (TREE_TYPE (decl))))
+    {
+      size_t sl;
+      const char *oldsym;
+      char *newsym;
+
+      old_lang_set_decl_assembler_name (decl);
+      id = DECL_ASSEMBLER_NAME (decl);
+      /* Remove the leading underscore */
+remove_underscore:
+      oldsym = IDENTIFIER_POINTER (id);
+      sl = strlen (oldsym) + 2;
+      newsym = xmalloc (sl);
+      /* Specifying '*' as first symbol character tells gcc (see varasm.c,
+         function assemble_name()) to output the label as-is rather than
+         invoking the ASM_OUTPUT_LABELREF macro (which prepends a underscore) */
+      newsym [0] = '*';
+      memcpy (newsym + 1, oldsym, sl + 1);
+      XEXP (DECL_RTL (decl), 0) = gen_rtx (SYMBOL_REF, Pmode,
+        IDENTIFIER_POINTER (get_identifier (newsym)));
+    }
+  else if (lookup_attribute ("system", TYPE_ATTRIBUTES (TREE_TYPE (decl))))
+    {
+      id = get_identifier (IDENTIFIER_POINTER (DECL_NAME (decl)));
+      SET_DECL_ASSEMBLER_NAME (decl, id);
+      goto remove_underscore;
+    }
+  else
+    old_lang_set_decl_assembler_name (decl);
+}
+
+/* The first time we encounter a _Optlink or _System function we hook the
+ * lang_set_decl_assembler_name function so that instead of calling the
+ * original mangler function our function gets called. Then, if the function
+ * attribute is _System or _Optlink we mangle it according to respective
+ * rules (_System functions always get the name as-is (e.g. no underscore,
+ * no C++ mangling) and _Optlink don't get the leading underscore.
+ */
+static void hook_mangler (void)
+{
+  if (lang_set_decl_assembler_name != emx_lang_set_decl_assembler_name)
+    {
+      old_lang_set_decl_assembler_name = lang_set_decl_assembler_name;
+      lang_set_decl_assembler_name = emx_lang_set_decl_assembler_name;
+    }
+}
+
+tree ix86_handle_system_attribute (tree *node, tree name, tree args,
   int flags, bool *no_add_attrs)
 {
@@ -52 +103 @@
     }
 
+  hook_mangler ();
+
   return NULL_TREE;
 }
 
-/* Value is the number of bytes of arguments automatically
-   popped when returning from a subroutine call.
-   FUNDECL is the declaration node of the function (as a tree),
-   FUNTYPE is the data type of the function (as a tree),
-   or for a library call it is an identifier node for the subroutine name.
-   SIZE is the number of bytes of arguments passed on the stack.
-
-   On the 80386, the RTD insn may be used to pop them if the number
-   of args is fixed, but if the number is variable then the caller
-   must pop them all.  RTD can't be used for library calls now
-   because the library is compiled with the Unix compiler.
-   Use of RTD is a selectable option, since it is incompatible with
-   standard Unix calling sequences.  If the option is not selected,
-   the caller must always pop the args.
-
-   The attribute stdcall is equivalent to RTD on a per module basis.  */
-
-int
-emx_return_pops_args (fundecl, funtype, size)
-     tree fundecl;
-     tree funtype;
-     int size;
-{
-  return ix86_return_pops_args (fundecl, funtype, size);
-#if 0
-  int rtd = TARGET_RTD && (!fundecl || TREE_CODE (fundecl) != IDENTIFIER_NODE);
-
-    /* Cdecl functions override -mrtd, and never pop the stack */
-  if (!lookup_attribute ("cdecl", TYPE_ATTRIBUTES (funtype))
-   && !lookup_attribute ("system", TYPE_ATTRIBUTES (funtype)))
-  {
-    /* Stdcall functions will pop the stack if not variable args */
-    if (lookup_attribute ("stdcall", TYPE_ATTRIBUTES (funtype)))
-      rtd = 1;
-
-    /* `optlink' functions taking a variable number of arguments
-       should also pop the stack, but that's not implemented.
-       We treat `optlink' functions taking a variable number of
-       arguments like `system' functions.  */
-    if (lookup_attribute ("regparm", TYPE_ATTRIBUTES (funtype)))
-      rtd = 1;
-
-    if (rtd
-        && (TYPE_ARG_TYPES (funtype) == NULL_TREE
-            || (TREE_VALUE (tree_last (TYPE_ARG_TYPES (funtype))) == void_type_node)))
-      return size;
-  }
-
-  /* Lose any fake structure return argument */
-  /* @@@ This makes the generated code incompatible with that generated
-   * by 2.7.2. I think this belongs in the if (rtd) ... case. Any ideas? */
-  if (aggregate_value_p (TREE_TYPE (funtype)))
-    return GET_MODE_SIZE (Pmode);
-
-  return 0;
-#endif
+tree ix86_handle_optlink_attribute (tree *node, tree name, tree args,
+  int flags, bool *no_add_attrs)
+{
+  (void)args; (void)flags;
+  if (TREE_CODE (*node) != FUNCTION_TYPE
+      && TREE_CODE (*node) != METHOD_TYPE
+      && TREE_CODE (*node) != FIELD_DECL
+      && TREE_CODE (*node) != TYPE_DECL)
+    {
+      warning ("`%s' attribute only applies to functions",
+               IDENTIFIER_POINTER (name));
+      *no_add_attrs = true;
+    }
+
+  hook_mangler ();
+
+  return NULL_TREE;
 }
 
@@ -178 +192 @@
 }
 
-const char *
-emx_remove_underscore (tree decl)
-{
-  /* ??? This probably should use XSTR (XEXP (DECL_RTL (decl), 0), 0) instead
-     of DECL_ASSEMBLER_NAME.  */
-  const char *asmname = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
-  char *newsym = xmalloc (strlen (asmname) + 2);
-  sprintf (newsym, "\b%s", asmname);
-  return IDENTIFIER_POINTER (get_identifier (newsym));
-}
-
-/* Cover function to implement ENCODE_SECTION_INFO.  */
+/* Cover function to implement ENCODE_SECTION_INFO.
+   Note that this could be implemented much better by doing the
+   stdcall mangling like optlink and system, but unfortunately */
 
 void
 emx_encode_section_info (tree decl)
 {
-  /* This bit is copied from i386.h.  */
-  if (optimize > 0 && TREE_CONSTANT (decl)
-      && (!flag_writable_strings || TREE_CODE (decl) != STRING_CST))
+  /* The default ENCODE_SECTION_INFO from i386.h */
+  if (flag_pic)
     {
       rtx rtl = (TREE_CODE_CLASS (TREE_CODE (decl)) != 'd'
                  ? TREE_CST_RTL (decl) : DECL_RTL (decl));
-      SYMBOL_REF_FLAG (XEXP (rtl, 0)) = 1;
-    }
-
+
+      if (GET_CODE (rtl) == MEM)
+        {
+          if (TARGET_DEBUG_ADDR
+              && TREE_CODE_CLASS (TREE_CODE (decl)) == 'd')
+            {
+              fprintf (stderr, "Encode %s, public = %d\n",
+                       IDENTIFIER_POINTER (DECL_NAME (decl)),
+                       TREE_PUBLIC (decl));
+            }
+
+          SYMBOL_REF_FLAG (XEXP (rtl, 0))
+            = (TREE_CODE_CLASS (TREE_CODE (decl)) != 'd'
+               || ! TREE_PUBLIC (decl));
+        }
+    }
+
+  /* If declaring a function, mangle it if it's stdcall */
   if (TREE_CODE (decl) == FUNCTION_DECL)
     {
-      if (lookup_attribute ("stdcall",
-                          TYPE_ATTRIBUTES (TREE_TYPE (decl))))
+      if (lookup_attribute ("stdcall", TYPE_ATTRIBUTES (TREE_TYPE (decl))))
         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

@@ -91 +91 @@
 #define DWARF2_UNWIND_INFO 1
 
-/* The function to call after __main in the case program uses exceptions */
-#define NAME__EH_INIT "__ehInit"
+/* We want the _System attribute */
+#define TARGET_SYSTEM_DECL_ATTRIBUTES
+/* Handle _System attribute */
+extern tree ix86_handle_system_attribute PARAMS ((tree *, tree, tree, int, _Bool *));
+
+/* We want the _Optlink attribute */
+#define TARGET_OPTLINK_DECL_ATTRIBUTES
+/* Handle _Optlink attribute */
+extern tree ix86_handle_optlink_attribute PARAMS ((tree *, tree, tree, int, _Bool *));
 
 /* This macros will stick a label to exception table for current file,
@@ -171 +178 @@
 
 /*******************************************************************
-   The following encodings are used for label names
-   depending on their attributes:
-
    stdcall labels get a suffix consisting of an at-sign '@' and
    the size of parameters in bytes rounded to next multiple of 4.
-
-   optlink labels get a prefix of '\b' (e.g. backspace). This kind of
-   means that the symbol name should not be prefixed by an underscore.
 *******************************************************************/
 
@@ -196 +197 @@
   const char *_p;                                                       \
   const char *_name = SYMBOL_NAME;                                      \
-  if (*_name == '\b') _name++;                                          \
   for (_p = _name; *_p && *_p != '@'; ++_p)                             \
     ;                                                                   \
@@ -214 +214 @@
 #undef ASM_OUTPUT_LABELREF
 #define ASM_OUTPUT_LABELREF(STREAM, NAME)                               \
-  fprintf (STREAM, "%s%s", *NAME == '\b' ? "" : USER_LABEL_PREFIX,      \
-    *NAME == '\b' ? NAME + 1 : NAME)
-
-/* Handle _optlink attributes */
-extern tree ix86_handle_optlink_attribute PARAMS ((tree *, tree, tree, int, _Bool *));
+  fprintf (STREAM, "%s%s", USER_LABEL_PREFIX, NAME)
 
 /******************************************************************************
@@ -241 +237 @@
     fprintf (FILE, "\tcall __mcount\n");                                \
 }
-
-/* Calling conventions */
-
-extern int emx_return_pops_args PARAMS ((tree, tree, int));
-#undef RETURN_POPS_ARGS
-#define RETURN_POPS_ARGS(FUNDECL,FUNTYPE,SIZE)                          \
-    (emx_return_pops_args (FUNDECL, FUNTYPE, SIZE))
 
 /******************************************************************************

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

@@ -1285 +1285 @@
   { "shared",    0, 0, true,  false, false, ix86_handle_shared_attribute },
 #endif
-#ifdef EMX
-  { "system",    0, 0, false, true,  true,  ix86_handle_cdecl_attribute },
+#ifdef TARGET_SYSTEM_DECL_ATTRIBUTES
+  /* System says the function is extern "C" and is not underscored. */
+  { "system",    0, 0, false, true,  true,  ix86_handle_system_attribute },
+#endif
+#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES
+  /* Optlink is like regparm with a few differences */
   { "optlink",   0, 0, false, true,  true,  ix86_handle_optlink_attribute },
 #endif
@@ -1509 +1513 @@
   int rtd = TARGET_RTD && (!fundecl || TREE_CODE (fundecl) != IDENTIFIER_NODE);
 
-    /* Cdecl functions override -mrtd, and never pop the stack.  */
-  if (! lookup_attribute ("cdecl", TYPE_ATTRIBUTES (funtype))) {
+  /* Cdecl functions override -mrtd, and never pop the stack.  */
+  if (! lookup_attribute ("cdecl", TYPE_ATTRIBUTES (funtype))
+#ifdef TARGET_SYSTEM_DECL_ATTRIBUTES
+   && ! lookup_attribute ("system", TYPE_ATTRIBUTES (funtype))
+#endif
+     ) {
 
     /* Stdcall functions will pop the stack if not variable args.  */
@@ -1605 +1613 @@
       if (attr)
         cum->nregs = TREE_INT_CST_LOW (TREE_VALUE (TREE_VALUE (attr)));
-#ifdef EMX
+#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES
       if (lookup_attribute ("optlink", TYPE_ATTRIBUTES (fntype)))
         {
           cum->nregs = 3; cum->optlink = 1;
         }
-#endif /* EMX */
+#endif
     }
   cum->maybe_vaarg = false;
@@ -1621 +1629 @@
   if (cum->nregs)
     {
+#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES
+      /* Count conforming arguments for optlink */
+      int cfarg_count = 0;
+#endif
+
       for (param = (fntype) ? TYPE_ARG_TYPES (fntype) : 0;
            param != 0; param = next_param)
         {
+#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES
+          if (INTEGRAL_TYPE_P (TREE_VALUE (param))
+           || POINTER_TYPE_P (TREE_VALUE (param)))
+            cfarg_count++;
+#endif
           next_param = TREE_CHAIN (param);
           if (next_param == 0 && TREE_VALUE (param) != void_type_node)
             {
+#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES
+              /* Visual Age docs says that the params preceeding the
+                 ellipsis still are passed in registers. */
+              if (cum->optlink)
+                cum->nregs = cfarg_count > 3 ? 3 : cfarg_count;
+              else
+#endif
               if (!TARGET_64BIT)
                 cum->nregs = 0;
@@ -2204 +2229 @@
         {
           cum->words += words;
-#ifdef EMX
+#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES
+          /* Optlink functions never pass aggregates in registers
+             (they are pushed on the stack, and the registers are
+             preserved for following parameters). Unfortunately GCC
+             optimizes short structures to SImode or DImode, thus
+             this detection works only for large structs. */
           if (cum->optlink && mode == BLKmode)
-            return;                     /* Skip aggregates */
-#endif /* EMX */
+            return;
+#endif
           cum->nregs -= words;
           cum->regno += words;
@@ -2272 +2302 @@
 
       case BLKmode:
-#ifdef EMX
+#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES
         if (cum->optlink)
           break;
         /* fall through */
-#endif /* EMX */
+#endif
       case DImode:
       case SImode:
@@ -2282 +2312 @@
       case QImode:
         if (words <= cum->nregs)
-#ifdef EMX
+#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES
+          /* Optlink specs says that the parameter is passed in a register
+             and space on the stack is reserved for it as well (which is not
+             filled). Currently GCC will pass the parameter *both* in register
+             and stack; this is suboptimal but is compatible. */
           if (cum->optlink)
             {
@@ -2293 +2327 @@
             }
           else
-#endif /* EMX */
+#endif
           ret = gen_rtx_REG (mode, cum->regno);
         break;
@@ -2308 +2342 @@
                words, cum->words, cum->nregs, GET_MODE_NAME (mode), named);
 
-#ifdef EMX
+#ifdef TARGET_OPTLINK_DECL_ATTRIBUTES
       if (ret && GET_CODE (ret) == PARALLEL)
         fprintf (stderr, ", stack/reg=%%e%s",
                  reg_names[ REGNO(XEXP (XVECEXP (ret, 0, 1), 0))]);
       else
-#endif /* EMX */
+#endif
       if (ret)
         fprintf (stderr, ", reg=%%e%s", reg_names[ REGNO (ret) ]);

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

@@ -1 @@
-# bird (#424): dropping multilibs. Old hacks - START
-## EMX target have share libgcc, but the names are release specific and constrained by 8.3 limits.
-## The link command depends heavily on the directory structure.
-#SHLIB_EXT      =
-#SHLIB_BASENAME = gcc$(gccdll_version)
-#SHLIB_MULTINAME= $(SHLIB_BASENAME)`echo @shlib_so_name@ | cut -b10`
-#SHLIB_DLLNAME  = $(SHLIB_MULTINAME).dll
-#SHLIB_LINK     = export DLLAR_CMDLINE="@shlib_objs@" && \
-#       kRx.exe dllar.cmd -o $$(@D)/$(SHLIB_DLLNAME) \
-#       -ordinal @multilib_flags@ -nocrtdll \
-#       -ex "__main __do_global_* _GLOBAL* _exit_dummy_ref __ctordtor* __eh* _DLL_InitTerm" \
-#       -d "GNU C runtime shared library version $(gcc_version)" \
-#       -libf "INITINSTANCE TERMGLOBAL" -lc_static -lc_import \
-#    && mv -f $$(@D)/$(SHLIB_MULTINAME).a $$(@D)/$(SHLIB_BASENAME).a \
-#       && ar rs $$(@D)/$(SHLIB_BASENAME).a libgcc/$$(@D)/__main.o libgcc/$$(@D)/emx-ctordtor.o libgcc/$$(@D)/emx-eh.o libgcc/$$(@D)/emx-dllinit.o \
-#    && touch $$@
-#SHLIB_SUBDIR  = `echo @shlib_base_name@ | sed -e "s/^libgcc_s_//" -e "s,_,/,g"`
-#SHLIB_INSTALL = $$(INSTALL_DATA) $(SHLIB_SUBDIR)/$(SHLIB_DLLNAME) $$(DESTDIR)$$(slibdir)/ \
-#    && $$(INSTALL_DATA) $(SHLIB_SUBDIR)/$(SHLIB_BASENAME).a $$(DESTDIR)$$(libsubdir)/$(SHLIB_SUBDIR)/
-#
-## EMX Multi-threaded/Single-threaded libraries.
-#MULTILIB_OPTIONS    = Zmt
-#MULTILIB_DIRNAMES   = mt st
-#MULTILIB_MATCHES    = Zmt=Zmts Zmt=Zmtd
-#MULTILIB_EXCEPTIONS =
-#MULTILIB_EXTRA_OPTS =
-# bird (#424): dropping multilibs. Old hacks - END
+# The command to run REXX scripts
+# (that can invoke CMD.EXE commands! Never user kRx.exe here!)
+REXX = $(subst \,/,$(OS2_SHELL)) /c
 
 # EMX target have share libgcc, but the names are release specific and constrained by 8.3 limits.
@@ -35 +11 @@
 SHLIB_LINK     = export DLLAR_CMDLINE="$$(patsubst %.o,%.obj,@shlib_objs@)" \
         && emxomf @shlib_objs@ \
-        && kRx.exe dllar.cmd -o $$(@D)/$(SHLIB_DLLNAME) \
+        && $(REXX) dllar.cmd -o $$(@D)/$(SHLIB_DLLNAME) \
         -ordinal @multilib_flags@ -nocrtdll \
         -flags "-g -Zomf -v" \
@@ -46 +22 @@
 else
 SHLIB_LINK     = export DLLAR_CMDLINE="@shlib_objs@" && \
-        kRx.exe dllar.cmd -o $$(@D)/$(SHLIB_DLLNAME) \
+        $(REXX) dllar.cmd -o $$(@D)/$(SHLIB_DLLNAME) \
         -ordinal @multilib_flags@ -nocrtdll \
         -ex "___main ___do_global_* __GLOBAL* __exit_dummy_ref ___ctordtor* ___eh* _DLL_InitTerm" \
@@ -66 +42 @@
 
 # Override linker flags
-# bird: The -B specification doesn't work too well here...
-# bird: This better be removed....
-#LDFLAGS = -Zexe -Zcrtdll -B/emx/lib
-#LDFLAGS = -Zexe -Zcrtdll -B$(PATH_EMXPGCC)/lib
 LDFLAGS = -Zexe -Zcrtdll -Zstack 1024
 

trunk/src/gcc/gcc/configure

@@ -3087 +3087 @@
           s/  \\[^ ]/./g' |
     tr -d '
- ' | tr -s '*' '
+ \r' | tr -s '\\*' '
 ' | fold | sed '$a\
 ' > conftest.dmp
@@ -3161 +3161 @@
           s/  \\[^ ]/./g' |
     tr -d '
- ' | tr -s '*' '
+ \r' | tr -s '\\*' '
 ' | fold | sed '$a\
 ' > conftest.dmp
@@ -7992 +7992 @@
     fi
   elif test x$gcc_cv_ld != x; then
-    for gcc_WS in 4 8; do
-      cat > conftest.s <<EOF
-        .text
-.LFB1:  .skip   64
-.LFE1:
-.LFB2:  .skip   64
-.LFE2:
-.LFB3:  .skip   64
-.LFE3:
-        .section .eh_frame,"aw",@progbits
-.Lframe1:
-        .4byte  .LECIE1-.LSCIE1
-.LSCIE1:
-        .4byte  0x0
-        .byte   0x1
-        .ascii "zR\0"
-        .uleb128 0x1
-        .sleb128 -4
-        .byte   0x8
-        .uleb128 0x1
-        .byte   0x50
-        .byte   0xc
-        .uleb128 0x4
-        .uleb128 0x4
-        .byte   0x88
-        .uleb128 0x1
-        .balign ${gcc_WS}
-.LECIE1:
-.LSFDE1:
-        .4byte  .LEFDE1-.LASFDE1
-.LASFDE1:
-        .4byte  .LASFDE1-.Lframe1
-        .${gcc_WS}byte  .LFB1
-        .${gcc_WS}byte  .LFE1-.LFB1
-        .uleb128 0x0
-        .balign ${gcc_WS}
-.LEFDE1:
-.LSFDE2:
-        .4byte  .LEFDE2-.LASFDE2
-.LASFDE2:
-        .4byte  .LASFDE2-.Lframe1
-        .${gcc_WS}byte  .LFB2
-        .${gcc_WS}byte  .LFE2-.LFB2
-        .uleb128 0x0
-        .balign ${gcc_WS}
-.LEFDE2:
-.LSFDE3:
-        .4byte  .LEFDE3-.LASFDE3
-.LASFDE3:
-        .4byte  .LASFDE3-.Lframe1
-        .${gcc_WS}byte  .LFB3
-        .${gcc_WS}byte  .LFE3-.LFB3
-        .uleb128 0x0
-        .balign ${gcc_WS}
-.LEFDE3:
-        .4byte  0
-EOF
-# r=bird: Make this omission OS/2 target specific.
-      rm -f conftest.*
-    done
   fi
   echo "$ac_t""$gcc_cv_ld_eh_frame_hdr_works" 1>&6

trunk/src/gcc/gcc/emx-nextstage

@@ -20 +20 @@
 [ -z "$SHELL" ] && SHELL=sh
 
-# Find emx directory
-emxdir=`echo "$PATH" | sed -e "s/.*;\([#-:<-~]*emx[#-:<-~]*\);.*/\1/" -e 'y,\\\\,//,'`
-[ -z "$emxdir" ] && emxdir=/emx
+# Find gcc directory
+gccdir=`which gcc`
+gccdir=`dirname $gccdir`
+gccdir=`dirname $gccdir`
+[ -z "$gccdir" ] && gccdir=/emx
+
+# The compilation will fail if we have toolkit in C_INCLUDE_PATH
+unset C_INCLUDE_PATH
+export C_INCLUDE_PATH=$gccdir/include
 
 for stage in 4 3 2 1 0; do
@@ -39 +45 @@
       LDFLAGS="-Zexe"
     else
-      LDFLAGS="-Zexe -B/emx/lib"
+      LDFLAGS="-Zexe -B$gccdir/lib"
     fi
   else
     ### gcc 3.0 cannot complete stage 2 with -fomit-frame-pointer! :-( ###
     CFLAGS="-s -O2 -mcpu=pentium -mpreferred-stack-boundary=2 -falign-loops=2 -falign-jumps=2 -falign-functions=2 -malign-strings=0"
-    LDFLAGS="-Zexe -Zcrtdll -B/emx/lib"
+    LDFLAGS="-Zexe -Zcrtdll -B$gccdir/lib"
   fi
   if [ ${stage} -eq 0 ]; then
@@ -64 +70 @@
          OLDCC="gcc -O6 -mno-stack-align-double -s" OLDCFLAGS= \
          LOOSE_WARN="-W -Wall -Wwrite-strings -Wstrict-prototypes" \
-         exec_prefix=$emxdir LANGUAGES="${LANGUAGES}" $* 2>&1 | tee $log
+         LANGUAGES="${LANGUAGES}" $* 2>&1 | tee $log
 
-    if [ $? = 0 ] && [ -f mt/gcc*.dll ]; then
+    if ! tail -1 $log | grep -q "Error"; then
       echo -n "Compilation finished succesfully. Finish this stage? [Y/N] "
       read answer
@@ -73 +79 @@
       emxload -q
       stage=`expr ${stage} + 1`
-      make stage${stage}
+      make SHELL=$SHELL stage${stage}
           ;;
       esac

trunk/src/gcc/gcc/function.c

@@ -6497 +6497 @@
   emit_library_call (gen_rtx_SYMBOL_REF (Pmode, NAME__MAIN), LCT_NORMAL,
                      VOIDmode, 0);
-#ifdef NAME__EH_INIT
-  if (flag_exceptions)
-    emit_library_call (gen_rtx_SYMBOL_REF (Pmode, NAME__EH_INIT), LCT_NORMAL,
-                     VOIDmode, 0);
-#endif
 #endif
 }