From 7453997e0e4f7fa169bfc3ada828834f89f5b38a Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Wed, 4 Dec 2002 20:36:23 +0000
Subject: [PATCH] 	* cxx.cc: New file. Implement new, new[], delete and
 delete[] 	operators and  __cxa_pure_virtual if compiled by gcc >=3. 
 * Makefile.in (DLL_OFILES): Add cxx.o. 	Remove libstdc++.a from
 cygwin1.dll link step.

---
 winsup/cygwin/ChangeLog   |  7 ++++++
 winsup/cygwin/Makefile.in |  4 ++--
 winsup/cygwin/cxx.cc      | 49 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 winsup/cygwin/cxx.cc

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index bec423b00..8fc1548a8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-26  Thomas Pfaff  <tpfaff@gmx.net>
+
+	* cxx.cc: New file. Implement new, new[], delete and delete[]
+	operators and  __cxa_pure_virtual if compiled by gcc >=3.
+	* Makefile.in (DLL_OFILES): Add cxx.o.
+	Remove libstdc++.a from cygwin1.dll link step.
+
 2002-11-29  Steve Osborn  <bub@io.com>
 
 	* fhandler_tty.cc (fhandler_pty_master::accept_input): Move
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index fe244e357..94dac23f2 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -124,7 +124,7 @@ MALLOC_OFILES=@MALLOC_OFILES@
 DLL_IMPORTS:=$(w32api_lib)/libkernel32.a
 
 # Please maintain this list in sorted order, with maximum files per 80 col line
-DLL_OFILES:=assert.o autoload.o cygheap.o cygserver_client.o \
+DLL_OFILES:=assert.o autoload.o cxx.o cygheap.o cygserver_client.o \
 	cygserver_transport.o cygserver_transport_pipes.o \
 	cygserver_transport_sockets.o cygthread.o dcrt0.o debug.o \
 	delqueue.o dir.o dlfcn.o dll_init.o dtable.o environ.o errno.o \
@@ -263,7 +263,7 @@ maintainer-clean realclean: clean
 new-$(DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp
 	$(CXX) $(CXXFLAGS) -nostdlib -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \
 	-e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \
-	$(MALLOC_OBJ) $(LIBM) -lstdc++ $(LIBC) \
+	$(MALLOC_OBJ) $(LIBM) $(LIBC) \
 	-lgcc $(DLL_IMPORTS)
 
 # Rule to build libcygwin.a
diff --git a/winsup/cygwin/cxx.cc b/winsup/cygwin/cxx.cc
new file mode 100644
index 000000000..b52485a20
--- /dev/null
+++ b/winsup/cygwin/cxx.cc
@@ -0,0 +1,49 @@
+/* cxx.cc
+
+   Copyright 2002 Red Hat, Inc.
+
+This file is part of Cygwin.
+
+This software is a copyrighted work licensed under the terms of the
+Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
+details. */
+
+#if (__GNUC__ >= 3)
+
+#include "winsup.h"
+#include <stdlib.h>
+
+void *
+operator new (size_t s)
+{
+  void *p = malloc (s);
+  if (p)
+    memset (p,0,s);
+  return p;
+}
+
+void
+operator delete (void *p)
+{
+  free (p);
+}
+
+void *
+operator new[] (size_t s)
+{
+  return ::operator new (s);
+}
+
+void
+operator delete[] (void *p)
+{
+  ::operator delete (p);
+}
+
+extern "C" void
+__cxa_pure_virtual (void)
+{
+  api_fatal ("pure virtual method called");
+}
+
+#endif
-- 
2.43.5