shebs 02/08/20 21:12:06
Modified: gcc mklibgcc.in
libstdc++-v3/libsupc++ new_op.cc
Log:
Make libgcc_kext.a build again.
Revision Changes Path
1.17 +3 -1 gcc3/gcc/mklibgcc.in
Index: mklibgcc.in
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/mklibgcc.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mklibgcc.in 2002/08/02 10:05:26 1.16
+++ mklibgcc.in 2002/08/21 04:12:04 1.17
@@ -324,7 +324,9 @@
cxx_root='$(srcdir)/../libstdc++-v3' ; cxx_root_incl=${cxx_root}/include
config_stuff='$(objdir)'
file=${cxx_root}/libsupc++/${name}
- incls="-I${cxx_root}/libsupc++ -I${cxx_root_incl}/std -I${cxx_root_incl}/c_std
-I${config_stuff}"
+ obj_incl='$(objdir)/../$(ARCH_NAME)/libstdc++-v3/include'
+ obj_incl2=${obj_incl}'/$(ARCH_NAME)-darwin'
+ incls="-I${cxx_root}/libsupc++ -I${cxx_root_incl}/std -I${cxx_root_incl}/c_std
-I${config_stuff} -I${obj_incl} -I${obj_incl2}"
out="libcc_kext/${dir}/${stem}${objext}"
echo ''
1.7 +8 -1 gcc3/libstdc++-v3/libsupc++/new_op.cc
Index: new_op.cc
===================================================================
RCS file: /cvs/Darwin/gcc3/libstdc++-v3/libsupc++/new_op.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- new_op.cc 2002/08/02 10:12:28 1.6
+++ new_op.cc 2002/08/21 04:12:05 1.7
@@ -30,7 +30,10 @@
#include "new"
/* APPLE LOCAL begin libcc_kext */
#ifdef LIBCC_KEXT
-extern "C" { extern int panic (); }
+extern "C" {
+extern void *malloc (size_t);
+extern int panic ();
+}
#define ABORT() panic ()
#else
#include <cstdlib>
@@ -41,7 +44,11 @@
using std::new_handler;
using std::bad_alloc;
+/* APPLE LOCAL libcc_kext */
+#ifndef LIBCC_KEXT
using std::malloc;
+/* APPLE LOCAL libcc_kext */
+#endif
extern new_handler __new_handler;
