Changeset 9

Timestamp:

Apr 16, 2003, 4:03:38 PM (22 years ago)

Author:

bird

Message:

Applied initial diff from Platon.

Location:

trunk/src/gcc

Files:

• config/mh-emx (added)
• configure.in (modified) (1 diff, 1 prop)
• gcc/Makefile.in (modified) (7 diffs, 1 prop)
• gcc/cfg.sh (added)
• gcc/clh.c (added)
• gcc/config.gcc (modified) (1 diff, 1 prop)
• gcc/config/i386/emx-ctordtor.c (added)
• gcc/config/i386/emx-dllinit.c (added)
• gcc/config/i386/emx-eh.c (added)
• gcc/config/i386/emx-libgcc1.asm (added)
• gcc/config/i386/emx.c (added)
• gcc/config/i386/emx.h (added)
• gcc/config/i386/i386.c (modified) (12 diffs, 1 prop)
• gcc/config/i386/i386.h (modified) (3 diffs, 1 prop)
• gcc/config/i386/t-emx (added)
• gcc/config/i386/xm-emx.h (added)
• gcc/configure.in (modified) (4 diffs, 1 prop)
• gcc/cp/Make-lang.in (modified) (1 diff, 1 prop)
• gcc/cppinit.c (modified) (2 diffs, 1 prop)
• gcc/cppmain.c (modified) (1 diff, 1 prop)
• gcc/doc/invoke.texi (modified) (3 diffs, 1 prop)
• gcc/dwarf2out.c (modified) (1 diff, 1 prop)
• gcc/emx-nextstage (added)
• gcc/f/Make-lang.in (modified) (2 diffs, 1 prop)
• gcc/fix-header.c (modified) (1 diff, 1 prop)
• gcc/fixinc/mkfixinc.sh (modified) (1 diff, 1 prop)
• gcc/fixinc/procopen.c (modified) (1 diff, 1 prop)
• gcc/fixinc/server.c (modified) (1 diff, 1 prop)
• gcc/function.c (modified) (1 diff, 1 prop)
• gcc/gcc.c (modified) (14 diffs, 1 prop)
• gcc/genattrtab.c (modified) (1 diff, 1 prop)
• gcc/genmultilib (modified) (3 diffs, 1 prop)
• gcc/gthr-os2.h (added)
• gcc/gthr.h (modified) (2 diffs, 1 prop)
• gcc/java/Make-lang.in (modified) (2 diffs, 1 prop)
• gcc/libgcc2.c (modified) (2 diffs, 1 prop)
• gcc/mklibgcc.in (modified) (1 diff, 1 prop)
• gcc/mkoptdesc.sh (added)
• gcc/prefix.c (modified) (2 diffs, 1 prop)
• gcc/target-def.h (modified) (1 diff, 1 prop)
• gcc/toplev.c (modified) (1 diff, 1 prop)
• gcc/tradcpp.c (modified) (1 diff, 1 prop)
• libf2c/cfg.sh (added)
• libiberty/basename.c (modified) (1 diff, 1 prop)
• libiberty/config.table (modified) (1 diff, 1 prop)
• libiberty/config/mh-emx (added)
• libiberty/getpwd.c (modified) (1 diff, 1 prop)
• libiberty/pexecute.c (modified) (4 diffs, 1 prop)
• libiberty/strerror.c (modified) (2 diffs, 1 prop)
• libobjc/cfg.sh (added)
• libobjc/thr-os2.c (modified) (2 diffs, 1 prop)
• libstdc++-v3/cfg.sh (added)
• libstdc++-v3/config/os/os2emx (added)
• libstdc++-v3/config/os/os2emx/bits (added)
• libstdc++-v3/config/os/os2emx/bits/ctype_base.h (added)
• libstdc++-v3/config/os/os2emx/bits/ctype_inline.h (added)
• libstdc++-v3/config/os/os2emx/bits/ctype_noninline.h (added)
• libstdc++-v3/config/os/os2emx/bits/os_defines.h (added)
• libstdc++-v3/configure.target (modified) (1 diff, 1 prop)

trunk/src/gcc/configure.in

@@ -245 +245 @@
   *-*-sysv*)
     host_makefile_frag="${host_makefile_frag} config/mh-sysv"
+    ;;
+  i[3456]86-*-os2*)
+    host_makefile_frag="${host_makefile_frag} config/mh-emx"
     ;;
 esac

trunk/src/gcc/gcc/Makefile.in

@@ -590 +590 @@
 # of HOST_CFLAGS in build-make to match.
 ALL_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) \
-  $(CFLAGS) $(WARN_CFLAGS) $(XCFLAGS) @DEFS@
+  $(CFLAGS) $(WARN_CFLAGS) $(XCFLAGS) $(CLH_CFLAGS) @DEFS@
 
 # Likewise.
@@ -620 +620 @@
 HOST_PRINT = $(HOST_PREFIX)print-rtl.o
 HOST_ERRORS = $(HOST_PREFIX)errors.o
+
+# This gets linked into gcc if command-line help was enabled
+CLH_LIBS = @gcc_clh_libs@
+# These definitions enables --help for gcc
+CLH_CFLAGS = @gcc_clh_cflags@
+CLH_GCC = @gcc_clh_gcc@
+CLH_CPP = @gcc_clh_cpp@
+CLH_G77 = @gcc_clh_g77@
+CLH_GCJ = @gcc_clh_gcj@
 
 # Specify the directories to be searched for header files.
@@ -944 +953 @@
 # and CC is `gcc'.  It is renamed to `gcc' when it is installed.
 xgcc$(exeext): gcc.o gccspec.o version.o intl.o prefix.o \
-   version.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
+   version.o $(LIBDEPS) $(EXTRA_GCC_OBJS) $(CLH_GCC)
         $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o gccspec.o intl.o \
-          prefix.o version.o $(EXTRA_GCC_OBJS) $(LIBS)
+          prefix.o version.o $(EXTRA_GCC_OBJS) $(CLH_GCC) $(LIBS)
 
 # cpp is to cpp0 as gcc is to cc1.
@@ -952 +961 @@
 # instead of gccspec.o.
 cpp$(exeext): gcc.o cppspec.o version.o intl.o prefix.o \
-   version.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
+   version.o $(LIBDEPS) $(EXTRA_GCC_OBJS) $(CLH_CPP)
         $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o cppspec.o intl.o \
-          prefix.o version.o $(EXTRA_GCC_OBJS) $(LIBS)
+          prefix.o version.o $(EXTRA_GCC_OBJS) $(CLH_CPP) $(LIBS)
 
 # Dump a specs file to make -B./ read these specs over installed ones.
@@ -1623 +1632 @@
 halfpic.o: halfpic.c $(CONFIG_H) $(RTL_H) $(TREE_H) $(SYSTEM_H) halfpic.h
 
+clh.o: clh.c $(CONFIG_H)
+        $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+              -c `echo $(srcdir)/clh.c | sed 's,^\./,,'`
+
+clh_gcc.c: doc/invoke.texi mkoptdesc.sh
+        ./mkoptdesc.sh doc/invoke.texi gcc > clh_gcc.c
+
+clh_cpp.c: doc/invoke.texi mkoptdesc.sh
+        ./mkoptdesc.sh doc/invoke.texi cpp > clh_cpp.c
+
 #
 
@@ -2741 +2760 @@
           RANLIB_FOR_TARGET="$$r_f_t" \
           DESTDIR="$(DESTDIR)" \
+          DESTDIR="$(DESTDIR)" \
           libsubdir="$(libsubdir)" \
           slibdir="$(slibdir)" \
@@ -2767 +2787 @@
           INSTALL_DATA="$(INSTALL_DATA)" \
           RANLIB_FOR_TARGET="$$r_f_t" \
-          DESTDIR="$(DESTDIR)" \
           libsubdir="$(libsubdir)" \
           slibdir="$(slibdir)" \

trunk/src/gcc/gcc/config.gcc

@@ -1578 +1578 @@
         fi
         ;;
+i*86-pc-*emx)           # i?86 running OS/2
+        xm_file=i386/xm-emx.h
+        tm_file=i386/emx.h
+        extra_objs=emx.o
+        xm_defines="USG BSTRING NO_SYS_SIGLIST"
+        exeext=.exe
+        tmake_file=i386/t-emx
+        fixincludes=Makefile.in
+        target_alias=${host}
+        CFLAGS="-Zstack 1024 -Zcrtdll"
+        if test x$enable_threads = xyes; then
+                thread_file=os2
+        fi
+        gas=yes
+        gnu_ld=yes
+        ;;
 i[34567]86-*-interix*)
         tm_file="i386/i386-interix.h interix.h"

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

@@ -629 +629 @@
 const char *ix86_align_jumps_string;
 
+/* Power of two alignment for constant strings in bytes.  */
+const char *ix86_align_constr_string;
+
 /* Power of two alignment for stack boundary in bytes.  */
 const char *ix86_preferred_stack_boundary_string;
@@ -641 +644 @@
 /* Power of two alignment for functions.  */
 const char *ix86_align_funcs_string;
+
+/* Power of two alignment for constant strings.  */
+int ix86_align_constr;
 
 /* Prefix built by ASM_GENERATE_INTERNAL_LABEL.  */
@@ -852 +858 @@
       const int align_jump_max_skip;
       const int align_func;
+      const int align_constr;
       const int branch_cost;
     }
   const processor_target_table[PROCESSOR_max] =
     {
-      {&i386_cost, 0, 0, 4, 3, 4, 3, 4, 1},
-      {&i486_cost, 0, 0, 16, 15, 16, 15, 16, 1},
-      {&pentium_cost, 0, 0, 16, 7, 16, 7, 16, 1},
-      {&pentiumpro_cost, 0, 0, 16, 15, 16, 7, 16, 1},
-      {&k6_cost, 0, 0, 32, 7, 32, 7, 32, 1},
-      {&athlon_cost, 0, 0, 16, 7, 64, 7, 16, 1},
-      {&pentium4_cost, 0, 0, 0, 0, 0, 0, 0, 1}
+      {&i386_cost, 0, 0, 4, 3, 4, 3, 4, 2, 1},
+      {&i486_cost, 0, 0, 16, 15, 16, 15, 16, 2, 1},
+      {&pentium_cost, 0, 0, 16, 7, 16, 7, 16, 5, 1},
+      {&pentiumpro_cost, 0, 0, 16, 15, 16, 7, 16, 5, 1},
+      {&k6_cost, 0, 0, 32, 7, 32, 7, 32, 5, 1},
+      {&athlon_cost, 0, 0, 16, 7, 64, 7, 16, 5, 1},
+      {&pentium4_cost, 0, 0, 0, 0, 0, 0, 0, 0, 1}
     };
 
@@ -1123 +1130 @@
     }
 
+  /* Validate -malign-strings= value, or provide default.  */
+  ix86_align_constr = processor_target_table[ix86_cpu].align_constr;
+  if (ix86_align_constr_string)
+    {
+      i = atoi (ix86_align_constr_string);
+      if (i < 0 || i > MAX_CODE_ALIGN)
+        error ("-malign-strings=%d is not between 0 and %d", i, MAX_CODE_ALIGN);
+      else
+        ix86_align_constr = i;
+    }
+
   /* Validate -mbranch-cost= value, or provide default.  */
   ix86_branch_cost = processor_target_table[ix86_cpu].branch_cost;
@@ -1267 +1285 @@
   { "shared",    0, 0, true,  false, false, ix86_handle_shared_attribute },
 #endif
+#ifdef EMX
+  { "system",    0, 0, false, true,  true,  ix86_handle_cdecl_attribute },
+  { "optlink",   0, 0, false, true,  true,  ix86_handle_optlink_attribute },
+#endif
   { NULL,        0, 0, false, false, false, NULL }
 };
@@ -1583 +1605 @@
       if (attr)
         cum->nregs = TREE_INT_CST_LOW (TREE_VALUE (TREE_VALUE (attr)));
+#ifdef EMX
+      if (lookup_attribute ("optlink", TYPE_ATTRIBUTES (fntype)))
+        {
+          cum->nregs = 3; cum->optlink = 1;
+        }
+#endif /* EMX */
     }
   cum->maybe_vaarg = false;
@@ -2176 +2204 @@
         {
           cum->words += words;
+#ifdef EMX
+          if (cum->optlink && mode == BLKmode)
+            return;                     /* Skip aggregates */
+#endif /* EMX */
           cum->nregs -= words;
           cum->regno += words;
@@ -2240 +2272 @@
 
       case BLKmode:
+#ifdef EMX
+        if (cum->optlink)
+          break;
+        /* fall through */
+#endif /* EMX */
       case DImode:
       case SImode:
@@ -2245 +2282 @@
       case QImode:
         if (words <= cum->nregs)
+#ifdef EMX
+          if (cum->optlink)
+            {
+              ret = gen_rtx (PARALLEL, mode, rtvec_alloc (2));
+              XVECEXP (ret, 0, 0) = gen_rtx (EXPR_LIST, VOIDmode,
+                                             NULL_RTX, const0_rtx);
+              XVECEXP (ret, 0, 1) = gen_rtx (EXPR_LIST, VOIDmode,
+                                             gen_rtx (REG, mode, cum->regno),
+                                             const0_rtx);
+            }
+          else
+#endif /* EMX */
           ret = gen_rtx_REG (mode, cum->regno);
         break;
@@ -2259 +2308 @@
                words, cum->words, cum->nregs, GET_MODE_NAME (mode), named);
 
+#ifdef EMX
+      if (ret && GET_CODE (ret) == PARALLEL)
+        fprintf (stderr, ", stack/reg=%%e%s",
+                 reg_names[ REGNO(XEXP (XVECEXP (ret, 0, 1), 0))]);
+      else
+#endif /* EMX */
       if (ret)
         fprintf (stderr, ", reg=%%e%s", reg_names[ REGNO (ret) ]);
@@ -3673 +3728 @@
   struct ix86_frame frame;
 
+#ifdef EMX
+  if (TARGET_EPILOGUE)
+    return 0;
+#endif /* EMX */
 #ifdef NON_SAVING_SETJMP
   if (NON_SAVING_SETJMP && current_function_calls_setjmp)
@@ -10764 +10823 @@
     }
   else if (TREE_CODE (exp) == STRING_CST && TREE_STRING_LENGTH (exp) >= 31
-           && align < 256)
-    return 256;
+           && !optimize_size && align < (8 << ix86_align_constr))
+    return 8 << ix86_align_constr;
 
   return align;

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

@@ -439 +439 @@
   { "align-functions=", &ix86_align_funcs_string,               \
     N_("Function starts are aligned to this power of 2") },     \
+  { "align-strings=",   &ix86_align_constr_string,              \
+    N_("Constant strings are aligned to this power of 2") },    \
   { "preferred-stack-boundary=",                                \
     &ix86_preferred_stack_boundary_string,                      \
@@ -1689 +1691 @@
   int sse_regno;                /* next available sse register number */
   int maybe_vaarg;              /* true for calls to possibly vardic fncts.  */
+#ifdef EMX
+  int optlink;                  /* nonzero if optlink (vs. regparm) */
+#endif /* EMX */
 } CUMULATIVE_ARGS;
 
@@ -3160 +3165 @@
 extern const char *ix86_align_jumps_string;     /* power of two alignment for non-loop jumps */
 extern const char *ix86_align_funcs_string;     /* power of two alignment for functions */
+extern const char *ix86_align_constr_string;    /* power of two alignment for constant strings */
 extern const char *ix86_preferred_stack_boundary_string;/* power of two alignment for stack boundary */
 extern const char *ix86_branch_cost_string;     /* values 1-5: see jump.c */

trunk/src/gcc/gcc/configure.in

@@ -343 +343 @@
 ], [enable_shared=yes])
 AC_SUBST(enable_shared)
+
+# Enable command-line help
+AC_ARG_ENABLE(clh,
+[  --enable-clh            enable GCC command-line help (+~90K executable!)])
 
 # Determine the host, build, and target systems
@@ -2113 +2117 @@
         .4byte  0
 EOF
-      if ($gcc_cv_as -o conftest.o conftest.s; exit $?) 1>&AC_FD_CC 2>&1; then
-        if ($gcc_cv_ld --eh-frame-hdr -shared -o conftest.so conftest.o; exit $?) 1>&AC_FD_CC 2>&1; then
-changequote(,)dnl
-          if $gcc_cv_objdump -h conftest.so 2>&AC_FD_CC \
-             | grep 'eh_frame_hdr[      ]*0*[01][048cC][        ]' 1>&AC_FD_CC 2>&1; then
-            gcc_cv_ld_eh_frame_hdr_works=yes; break
-          else
-            $gcc_cv_objdump -h conftest.so 2>/dev/null | grep eh_frame_hdr 1>&AC_FD_CC 2>&1
-          fi
-changequote([,])dnl
+dnl      if ($gcc_cv_as -o conftest.o conftest.s; exit $?) 1>&AC_FD_CC 2>&1; then
+dnl        if ($gcc_cv_ld --eh-frame-hdr -shared -o conftest.so conftest.o; exit $?) 1>&AC_FD_CC 2>&1; then
+dnl changequote(,)dnl
+dnl       if $gcc_cv_objdump -h conftest.so 2>&AC_FD_CC \
+dnl          | grep 'eh_frame_hdr[      ]*0*[01][048cC][        ]' 1>&AC_FD_CC 2>&1; then
+dnl         gcc_cv_ld_eh_frame_hdr_works=yes; break
+dnl       else
+dnl         $gcc_cv_objdump -h conftest.so 2>/dev/null | grep eh_frame_hdr 1>&AC_FD_CC 2>&1
+dnl       fi
+dnl changequote([,])dnl
         fi
       fi
@@ -2491 +2495 @@
 AC_SUBST(objdir)
 
+# Test if command-line help was enabled
+if [[ "x${enable_clh}" = xyes ]]; then
+        echo "Including GCC Command-Line Help"
+        host_extra_gcc_objs="$host_extra_gcc_objs clh${objext}"
+        gcc_clh_libs=-ltermcap
+        gcc_clh_cflags=-DCLH
+        gcc_clh_gcc="clh_gcc"${objext}
+        gcc_clh_cpp="clh_cpp"${objext}
+        gcc_clh_g77="clh_g77"${objext}
+        gcc_clh_gcj="clh_gcj"${objext}
+fi
+
 # Process the language and host/target makefile fragments.
 ${CONFIG_SHELL-/bin/sh} $srcdir/configure.frag $srcdir "$subdirs" "$dep_host_xmake_file" "$dep_tmake_file"
@@ -2524 +2540 @@
 AC_SUBST(gcc_version_full)
 AC_SUBST(gcc_version_trigger)
+AC_SUBST(gcc_clh_libs)
+AC_SUBST(gcc_clh_cflags)
+AC_SUBST(gcc_clh_gcc)
+AC_SUBST(gcc_clh_cpp)
+AC_SUBST(gcc_clh_g77)
+AC_SUBST(gcc_clh_gcj)
 AC_SUBST(host_exeext)
 AC_SUBST(host_extra_gcc_objs)

trunk/src/gcc/gcc/cp/Make-lang.in

@@ -73 +73 @@
 
 # Create the compiler driver for g++.
-GXX_OBJS = gcc.o g++spec.o intl.o prefix.o version.o 
-g++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(LIBDEPS)
+GXX_OBJS = gcc.o g++spec.o intl.o prefix.o version.o
+g++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(CLH_GCC) $(LIBDEPS)
         $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
-          $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(LIBS)
+          $(GXX_OBJS) $(EXTRA_GCC_OBJS) $(CLH_GCC) $(LIBS)
 
 # Create a version of the g++ driver which calls the cross-compiler.

trunk/src/gcc/gcc/cppinit.c

@@ -44 +44 @@
 # define INO_T_COPY(DEST, SRC) memcpy(&(DEST), &(SRC), sizeof (SRC))
 #else
-# if (defined _WIN32 && ! defined (_UWIN)) || defined __MSDOS__
+# if (defined _WIN32 && ! defined (_UWIN)) || defined __MSDOS__ || defined __EMX__
 #  define INO_T_EQ(A, B) 0
 # else
@@ -655 +655 @@
   return result;
 }
-
 
 /* This structure defines one built-in identifier.  A node will be

trunk/src/gcc/gcc/cppmain.c

@@ -75 +75 @@
      char **argv;
 {
+#ifdef COMPILER_HOST_INITIALIZATION
+  /* Perform host dependant initialization when needed.  */
+  COMPILER_HOST_INITIALIZATION;
+#endif
+
   general_init (argv[0]);
 

trunk/src/gcc/gcc/doc/invoke.texi

@@ -2362 +2362 @@
 @item -W
 @opindex W
-Print extra warning messages for these events:
+Print extra warning messages. The following events will produce warnings:
 
 @itemize @bullet
@@ -3804 +3804 @@
 @opindex fbranch-probabilities
 After running a program compiled with @option{-fprofile-arcs}
-(@pxref{Debugging Options,, Options for Debugging Your Program or
-@command{gcc}}), you can compile it a second time using
+(@pxref{Debugging Options,, Options for Debugging Your Program or @command{gcc}}),
+you can compile it a second time using
 @option{-fbranch-probabilities}, to improve optimizations based on
 the number of times each branch was taken.  When the program
@@ -10199 +10199 @@
 compiler will use mblen and mbtowc as defined by the default locale to
 recognize and translate multibyte characters.
+
+@item CLH_TERM
+@item TERM
+@findex CLH_TERM
+@findex TERM
+If @code{CLH_TERM} is set, or as a fallback @code{TERM} is set, @i{GCC}
+built-in command-line help will use it as a index into @code{TERMCAP} file
+to highlight the text of command-line help.
+
+These variables affects only the appearance of @i{GCC} built-in command-line
+help, and only if @i{GCC} was configured using @i{--enable-clh}.
+@code{CLH_TERM} is preferred over @code{TERM}, and can additionaly have a
+value of "-" which indicates to display command-line help with no highlighting.
 @end table
 

trunk/src/gcc/gcc/dwarf2out.c

@@ -2035 +2035 @@
     }
 
-#ifndef EH_FRAME_SECTION_NAME
+#if !defined (EH_FRAME_SECTION_NAME) || defined (DWARF2_FRAMEINFO_NULL_TERMINATED)
   if (for_eh)
     dw2_asm_output_data (4, 0, "End of Table");

trunk/src/gcc/gcc/f/Make-lang.in

@@ -68 +68 @@
   f77.stage1 f77.stage2 f77.stage3 f77.stage4
 
+clh_g77.c: f/invoke.texi mkoptdesc.sh
+        ./mkoptdesc.sh f/invoke.texi g77 > clh_g77.c
+
 g77spec.o: $(srcdir)/f/g77spec.c $(srcdir)/f/version.h $(SYSTEM_H) $(GCC_H) \
         $(CONFIG_H)
@@ -81 +84 @@
 # Create the compiler driver for g77.
 g77$(exeext): gcc.o g77spec.o g77version.o version.o prefix.o intl.o \
-  $(LIBDEPS) $(EXTRA_GCC_OBJS)
+  $(LIBDEPS) $(EXTRA_GCC_OBJS) $(CLH_G77)
         $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o g77spec.o g77version.o \
-           version.o prefix.o intl.o $(EXTRA_GCC_OBJS) $(LIBS)
+           version.o prefix.o intl.o $(EXTRA_GCC_OBJS) $(CLH_G77) $(LIBS)
 
 # Create a version of the g77 driver which calls the cross-compiler.

trunk/src/gcc/gcc/fix-header.c

@@ -1079 +1079 @@
   long int inf_size;
   struct symbol_list *cur_symbols;
+
+#if defined (__EMX__)
+  return 0;     // fix-header does only harm to emx` includes
+#endif
 
   if (argv[0] && argv[0][0])

trunk/src/gcc/gcc/fixinc/mkfixinc.sh

@@ -28 +28 @@
                 MAKE="${MAKE} TARGETS=oneprocess"
                 ;;
-
+        *-*-os2* )
+                fixincludes=
+                ;;
         * )
                 MAKE="${MAKE} TARGETS=oneprocess"

trunk/src/gcc/gcc/fixinc/procopen.c

@@ -46 +46 @@
  * If you do not wish that, delete this exception notice.
  */
-#include "auto-host.h"
-#include "ansidecl.h"
-#include "system.h"
-
+
+#include "fixlib.h"
 #include "server.h"
-#include "fixlib.h"
 
 STATIC const char* def_args[] =

trunk/src/gcc/gcc/fixinc/server.c

@@ -46 +46 @@
  * If you do not wish that, delete this exception notice.
  */
-#include "auto-host.h"
-
-#include "ansidecl.h"
-#include "system.h"
+
+#include "fixlib.h"
+#include "server.h"
 #include <signal.h>
-
-#include "server.h"
 
 #if !defined(volatile) && !defined(HAVE_VOLATILE)

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
 }

trunk/src/gcc/gcc/gcc.c

@@ -333 +333 @@
                                                  const char *));
 #endif
-#if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX)
+#if (defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX)) && !defined (NO_FORCE_EXEOBJ_SUFFIX)
 static const char *convert_filename     PARAMS ((const char *, int, int));
 #endif
@@ -1004 +1004 @@
    {"--write-dependencies", "-MD", 0},
    {"--write-user-dependencies", "-MMD", 0},
+#ifdef CLH
+   {"--help", "-h", "oj"},
+#endif
    {"--", "-f", "*j"}
  };
@@ -1190 +1193 @@
           i++;
         }
-
       /* Handle old-fashioned options--just copy them through,
          with their arguments.  */
@@ -1709 +1711 @@
 /* Name with which this program was invoked.  */
 
-static const char *programname;
+const char *programname;
 
 
@@ -3023 +3025 @@
 
 
-#if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX)
+#if (defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX)) && !defined (NO_FORCE_EXEOBJ_SUFFIX)
 
 /* Convert NAME to a new name if it is the standard suffix.  DO_EXE
@@ -3343 +3345 @@
     }
 
+#ifndef __EMX__
   /* Use LPATH like LIBRARY_PATH (for the CMU build program).  */
+  /* Under OS/2 (__EMX__) LPATH is used in LANManager client & server */
   GET_ENV_PATH_LIST (temp, "LPATH");
   if (temp && *cross_compile == '0')
@@ -3375 +3379 @@
         }
     }
+#endif /* not __EMX__ */
 
   /* Convert new-style -- options to old-style.  */
@@ -3577 +3582 @@
           verbose_flag++;
         }
+#ifdef CLH
+      else if (! strncmp (argv[i], "-h", 2))
+        {
+          extern int clh_display (const char *text, const char *selector);
+          extern char *gcc_clh_text;
+          exit (clh_display (gcc_clh_text, &argv[i][2]));
+        }
+#endif /* CLH */
       else if (argv[i][0] == '-' && argv[i][1] != 0)
         {
@@ -3723 +3736 @@
             case 'o':
               have_o = 1;
+#ifndef NO_FORCE_EXEOBJ_SUFFIX
 #if defined(HAVE_TARGET_EXECUTABLE_SUFFIX)
               if (! have_c)
@@ -3758 +3772 @@
                 argv[i] = convert_filename (argv[i], ! have_c, 0);
 #endif
+#endif
               goto normal_switch;
 
@@ -3826 +3841 @@
   /* Use 2 as fourth arg meaning try just the machine as a suffix,
      as well as trying the machine and the version.  */
-#ifndef OS2
   add_prefix (&exec_prefixes, standard_exec_prefix, "GCC",
               PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0);
@@ -3833 +3847 @@
   add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
               PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0);
-#endif
 
   add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS",
@@ -4078 +4091 @@
       else
         {
-#ifdef HAVE_TARGET_OBJECT_SUFFIX
+#if defined (HAVE_TARGET_OBJECT_SUFFIX) && !defined (NO_FORCE_EXEOBJ_SUFFIX)
           argv[i] = convert_filename (argv[i], 0, access (argv[i], F_OK));
 #endif
@@ -6162 +6175 @@
 
   if (n_infiles == added_libraries)
+#ifdef CLH
+    fatal ("no input files, try \"%s --help\"", programname);
+#else
     fatal ("no input files");
+#endif
 
   /* Make a place to record the compiler output file names

trunk/src/gcc/gcc/genattrtab.c

@@ -6115 +6115 @@
   int i;
 
+#ifdef EMX
+  /* Otherwise we can't use more than 32Mb memory and genattrtab uses a lot */
+  _uflags (_UF_SBRK_MODEL, _UF_SBRK_ARBITRARY);
+#endif
+
   progname = "genattrtab";
 

trunk/src/gcc/gcc/genmultilib

@@ -41 +41 @@
 # argument is empty, the option names will be used as the directory
 # names.
+# If number of elements in second argument is bigger than number of options
+# in the first argument, the n+1'th element is used as default directory
+# name (i.e. when no one of options specified in argument 1 was used)
 
 # The optional third argument is a list of options which are
@@ -237 +240 @@
 fi
 
+# See if default directory was specified
+if [ -n "$1" ]; then
+  defaultdir="$1"
+else
+  defaultdir="."
+fi
 # We need another recursive shell script to correctly handle positive
 # matches.  If we are invoked as
@@ -276 +285 @@
 done
 optout=`echo ${optout} | sed -e 's/^ //'`
-echo "\". ${optout};\","
+echo "\"${defaultdir} ${optout};\","
 
 # Work over the list of combinations.  We have to translate each one

trunk/src/gcc/gcc/gthr.h

@@ -79 +79 @@
      DCE threads with -D_DCE_THREADS
      Solaris/UI threads with -D_SOLARIS_THREADS
+     OS/2 threads with -D_OS2_THREADS
 */
 
@@ -88 +89 @@
 #elif _SOLARIS_THREADS
 #include "gthr-solaris.h"
+#elif _OS2_THREADS
+#include "gthr-os2.h"
 
 /* Include GTHREAD_FILE if one is defined.  */

trunk/src/gcc/gcc/java/Make-lang.in

@@ -69 +69 @@
 # Create the compiler driver for $(GCJ).
 $(GCJ)$(exeext): gcc.o jvspec.o version.o \
-           prefix.o intl.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
+           prefix.o intl.o $(LIBDEPS) $(EXTRA_GCC_OBJS) $(CLH_GCJ)
         $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o jvspec.o prefix.o intl.o \
-          version.o $(EXTRA_GCC_OBJS) $(LIBS)
+          version.o $(EXTRA_GCC_OBJS) $(CLH_GCJ) $(LIBS)
 
 # Create a version of the $(GCJ) driver which calls the cross-compiler.
@@ -97 +97 @@
         exit 1; } ; \
         mv -f k$$$$.h keyword.h)
+
+clh_gcj.c: java/gcj.texi mkoptdesc.sh
+        ./mkoptdesc.sh java/gcj.texi gcj > clh_gcj.c
 
 # Executables built by this Makefile:

trunk/src/gcc/gcc/libgcc2.c

@@ -1916 +1916 @@
     }
 #endif
-#if defined (EH_FRAME_SECTION_NAME) && !defined (HAS_INIT_SECTION)
+#if defined (EH_FRAME_SECTION_NAME) && !defined (HAS_INIT_SECTION) && !defined (DONT_AUTOREGISTER_FRAME_INFO)
   {
     static int completed = 0;
@@ -1935 +1935 @@
 __do_global_ctors (void)
 {
-#ifdef EH_FRAME_SECTION_NAME
+#if defined (EH_FRAME_SECTION_NAME) && !defined (DONT_AUTOREGISTER_FRAME_INFO)
   {
     static struct object object;

trunk/src/gcc/gcc/mklibgcc.in

@@ -17 +17 @@
 # LIB2ADDEH
 # LIB2ADDEHDEP
+# LIB2FUNCS_OMIT
 # FPBIT
 # FPBIT_FUNCS

trunk/src/gcc/gcc/prefix.c

@@ -274 +274 @@
 #ifdef UPDATE_PATH_HOST_CANONICALIZE
   /* Perform host dependent canonicalization when needed.  */
-  UPDATE_PATH_HOST_CANONICALIZE (path);
+  UPDATE_PATH_HOST_CANONICALIZE (result);
 #endif
 
@@ -297 +297 @@
   int len;
 {
+#ifndef __EMX__
   std_prefix = save_string (prefix, len);
-}
+#endif
+}

trunk/src/gcc/gcc/target-def.h

@@ -58 +58 @@
 #define TARGET_ASM_FUNCTION_EPILOGUE default_function_pro_epilogue
 #define TARGET_ASM_FUNCTION_END_PROLOGUE no_asm_to_stream
+#ifndef TARGET_ASM_FUNCTION_BEGIN_EPILOGUE
 #define TARGET_ASM_FUNCTION_BEGIN_EPILOGUE no_asm_to_stream
+#endif
 
 #if !defined(TARGET_ASM_CONSTRUCTOR) && !defined(USE_COLLECT2)

trunk/src/gcc/gcc/toplev.c

@@ -4656 +4656 @@
   int i;
 
+#ifdef COMPILER_HOST_INITIALIZATION
+  /* Perform host dependant initialization when needed.  */
+  COMPILER_HOST_INITIALIZATION;
+#endif
+
   /* Save in case md file wants to emit args as a comment.  */
   save_argc = argc;

trunk/src/gcc/gcc/tradcpp.c

@@ -524 +524 @@
   pending_dir *pend = (pending_dir *) xcalloc (argc, sizeof (pending_dir));
   int no_standard_includes = 0;
+
+#ifdef COMPILER_HOST_INITIALIZATION
+  /* Perform host dependant initialization when needed.  */
+  COMPILER_HOST_INITIALIZATION;
+#endif
 
   hex_init ();

trunk/src/gcc/libiberty/basename.c

@@ -22 +22 @@
 
 #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
+  defined (__OS2__) || defined (__EMX__)
 #define HAVE_DOS_BASED_FILE_SYSTEM
 #ifndef DIR_SEPARATOR_2 

trunk/src/gcc/libiberty/config.table

@@ -7 +7 @@
   i370-*-opened*)       frag=mh-openedition ;;
   i[345]86-*-windows*)  frag=mh-windows ;;
+  *-*-*emx)             frag=mh-emx ;;
 esac
 

trunk/src/gcc/libiberty/getpwd.c

@@ -57 +57 @@
 #endif
 
-#if !(defined (VMS) || (defined(_WIN32) && !defined(__CYGWIN__)))
+#if !(defined (VMS) || (defined(_WIN32) && !defined(__CYGWIN__)) || defined(__EMX__))
 
 /* Get the working directory.  Use the PWD environment variable if it's

trunk/src/gcc/libiberty/pexecute.c

@@ -82 +82 @@
 (??? It's not clear that GCC passes this flag correctly).  (@code{@var{flags} &
 PEXECUTE_FIRST}) is nonzero for the first process in chain.
-(@code{@var{flags} & PEXECUTE_FIRST}) is nonzero for the last process
+(@code{@var{flags} & PEXECUTE_LAST}) is nonzero for the last process
 in chain.  The first/last flags could be simplified to only mark the
 last of a chain of processes but that requires the caller to always
@@ -484 +484 @@
 #ifdef OS2
 
-/* ??? Does OS2 have process.h?  */
+/* This is for non-EMX OS/2 port (is it floating around anyway?) */
 extern int spawnv ();
 extern int spawnvp ();
@@ -663 +663 @@
 /* include for Unix-like environments but not for Dos-like environments */
 #if ! defined (__MSDOS__) && ! defined (OS2) && ! defined (MPW) \
-    && ! (defined (_WIN32) && ! defined (_UWIN))
+    && ! (defined (_WIN32) && ! defined (_UWIN)) && ! defined (__EMX__)
 
 extern int execv ();
@@ -790 +790 @@
 }
 
-#endif /* ! __MSDOS__ && ! OS2 && ! MPW && ! (_WIN32 && ! _UWIN) */
+#endif /* ! __MSDOS__ && ! OS2 && ! MPW && ! (_WIN32 && ! _UWIN) && ! && ! __EMX__ */
+
+#ifdef __EMX__
+
+#undef abort
+#include <process.h>
+#include <stdlib.h>
+#define INCL_DOSPROCESS
+#include <os2.h>
+
+int
+pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags)
+     const char *program;
+     char * const *argv;
+     const char *this_pname;
+     const char *temp_base;
+     char **errmsg_fmt, **errmsg_arg;
+     int flags;
+{
+  static int last_pipe_input = STDIN_FILE_NO;
+  int pid;
+  int pdes[2], org_stdin, org_stdout;
+  int input_desc = last_pipe_input;
+  int output_desc = STDOUT_FILE_NO;
+  int pipes_supported = _osmode != DOS_MODE || (_emx_env & 0x1000);
+
+  /* Since the function can reside in a DLL, we should take care
+     environ to not be NULL. Unfortunately this involves os2.h :-( - A.Z. */
+  if (!environ)
+    {
+      PTIB tib;
+      PPIB pib;
+      if (!DosGetInfoBlocks (&tib, &pib))
+      {
+        int count = 1;
+        char *env = pib->pib_pchenv;
+        char **cur;
+        while (*env++)
+          if (!*env)
+            count++, env++;
+        cur = environ = malloc (sizeof (char *) * count);
+        env = pib->pib_pchenv;
+        *cur++ = env;
+        while (*env++)
+          if (!*env)
+            env++, *cur++ = env;
+        cur [-1] = NULL;
+      }
+    }
+
+  if (!pipes_supported && (flags & PEXECUTE_ONE) != PEXECUTE_ONE)
+    {
+      static char *errtpl = "%s: exec %s (pipes not supported)";
+      *errmsg_fmt = (char *) xmalloc (strlen(errtpl) + \
+                     strlen(this_pname) + strlen(program));
+      sprintf (*errmsg_fmt, errtpl, this_pname, program);
+      *errmsg_arg = NULL;
+      return -1;
+    }
+  /* If this isn't the last process, make a pipe for its output,
+     and record it as waiting to be the input to the next process.  */
+  if (!(flags & PEXECUTE_LAST))
+    {
+      if (pipe (pdes) < 0)
+        {
+          static char *errtpl = "%s: pipe to/from %s";
+          *errmsg_fmt = (char *) xmalloc (strlen(errtpl) + \
+                         strlen(this_pname) + strlen(program));
+          sprintf (*errmsg_fmt, errtpl, this_pname, program);
+          *errmsg_arg = NULL;
+          return -1;
+        }
+      output_desc = pdes[WRITE_PORT];
+      last_pipe_input = pdes[READ_PORT];
+    }
+  else
+    last_pipe_input = STDIN_FILE_NO;
+  if (pipes_supported && input_desc != STDIN_FILE_NO)
+    {
+      org_stdin = dup (STDIN_FILE_NO);
+      dup2 (input_desc, STDIN_FILE_NO);
+      close (input_desc);
+    }
+  if (pipes_supported && output_desc != STDOUT_FILE_NO)
+    {
+      org_stdout = dup (STDOUT_FILE_NO);
+      dup2 (output_desc, STDOUT_FILE_NO);
+      close (output_desc);
+    }
+  pid = (flags & PEXECUTE_SEARCH ? spawnvp : spawnv) (P_NOWAIT, program, argv);
+  if (pipes_supported && input_desc != STDIN_FILE_NO)
+    {
+      dup2 (org_stdin, STDIN_FILE_NO);
+      close (org_stdin);
+    }
+  if (pipes_supported && output_desc != STDOUT_FILE_NO)
+    {
+      dup2 (org_stdout, STDOUT_FILE_NO);
+      close (org_stdout);
+    }
+  if (pid == -1)
+    {
+      static char *errtpl = "%s: error executing %s";
+      *errmsg_fmt = (char *) xmalloc (strlen(errtpl) + \
+                     strlen(this_pname) + strlen(program));
+      sprintf (*errmsg_fmt, errtpl, this_pname, program);
+      *errmsg_arg = NULL;
+    }
+  return pid;
+}
+
+int
+pwait (pid, status, flags)
+     int pid;
+     int *status;
+     int flags;
+{
+  int rc;
+  do
+   rc = waitpid (pid, status, flags);
+  while (rc < 0 && errno == EINTR);
+  return rc;
+}
+
+#endif /* __EMX__ */

trunk/src/gcc/libiberty/strerror.c

@@ -21 +21 @@
 #include <errno.h>
 
-#ifdef HAVE_SYS_ERRLIST
-#undef sys_nerr
-#undef sys_errlist
-#endif
-
 /*  Routines imported from standard C runtime libraries. */
 
@@ -38 +33 @@
 #else
 extern PTR memset ();
+#endif
+
+#ifdef HAVE_SYS_ERRLIST
+#undef sys_nerr
+#undef sys_errlist
 #endif
 

trunk/src/gcc/libobjc/thr-os2.c

@@ -43 +43 @@
 #undef BOOL
 
+#define __MT__
 #include <stdlib.h>
 
@@ -179 +180 @@
 __objc_mutex_allocate(objc_mutex_t mutex)
 {
-  if (DosCreateMutexSem (NULL, (HMTX)(&(mutex->backend)),0L,0) > 0)
+  if (DosCreateMutexSem (NULL, (PHMTX)(&(mutex->backend)),0L,0) > 0)
     return -1;
   else

trunk/src/gcc/libstdc++-v3/configure.target

@@ -122 +122 @@
     c_model=c
     ;;
+  *emx)
+    os_include_dir="config/os/os2emx"
+    ;;
   *)
     os_include_dir="config/os/generic"