From: Nathan Sidwell Date: Thu, 17 Aug 2000 14:40:31 +0000 (+0000) Subject: vec.cc (__cxa_vec_new): Set "C" linkage. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2f1b80afded2f0dce530ea8733ebc75a1ea5fe61;p=gcc.git vec.cc (__cxa_vec_new): Set "C" linkage. * vec.cc (__cxa_vec_new): Set "C" linkage. (__cxa_vec_ctor): Likewise. (__cxa_vec_cctor): Likewise. (__cxa_vec_dtor): Likewise. (__cxa_vec_delete): Likewise. * inc/cxxabi.h (__cxa_vec_new): Set "C" linkage. (__cxa_vec_ctor): Likewise. (__cxa_vec_cctor): Likewise. (__cxa_vec_dtor): Likewise. (__cxa_vec_delete): Likewise. From-SVN: r35760 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ef5b4cb255e..810fa52e71c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,16 @@ +2000-08-17 Nathan Sidwell + + * vec.cc (__cxa_vec_new): Set "C" linkage. + (__cxa_vec_ctor): Likewise. + (__cxa_vec_cctor): Likewise. + (__cxa_vec_dtor): Likewise. + (__cxa_vec_delete): Likewise. + * inc/cxxabi.h (__cxa_vec_new): Set "C" linkage. + (__cxa_vec_ctor): Likewise. + (__cxa_vec_cctor): Likewise. + (__cxa_vec_dtor): Likewise. + (__cxa_vec_delete): Likewise. + 2000-08-17 Nathan Sidwell * class.c (instantiate_type): Reinstate local variable diff --git a/gcc/cp/inc/cxxabi.h b/gcc/cp/inc/cxxabi.h index 2587e85f26f..2a7217faf2b 100644 --- a/gcc/cp/inc/cxxabi.h +++ b/gcc/cp/inc/cxxabi.h @@ -430,7 +430,7 @@ void *__dynamic_cast (const void *__src_ptr, /* object started from */ /* array ctor/dtor routines */ /* allocate and construct array */ -extern "C++" +extern "C" void *__cxa_vec_new (__SIZE_TYPE__ __element_count, __SIZE_TYPE__ __element_size, __SIZE_TYPE__ __padding_size, @@ -438,14 +438,14 @@ void *__cxa_vec_new (__SIZE_TYPE__ __element_count, void (*__destructor) (void *)); /* construct array */ -extern "C++" +extern "C" void __cxa_vec_ctor (void *__array_address, __SIZE_TYPE__ __element_count, __SIZE_TYPE__ __element_size, void (*__constructor) (void *), void (*__destructor) (void *)); -extern "C++" +extern "C" void __cxa_vec_cctor (void *dest_array, void *src_array, __SIZE_TYPE__ element_count, @@ -454,14 +454,14 @@ void __cxa_vec_cctor (void *dest_array, void (*destructor) (void *)); /* destruct array */ -extern "C++" +extern "C" void __cxa_vec_dtor (void *__array_address, __SIZE_TYPE__ __element_count, __SIZE_TYPE__ __element_size, void (*__destructor) (void *)); /* destruct and release array */ -extern "C++" +extern "C" void __cxa_vec_delete (void *__array_address, __SIZE_TYPE__ __element_size, __SIZE_TYPE__ __padding_size, diff --git a/gcc/cp/vec.cc b/gcc/cp/vec.cc index 5e963cad79a..83185978bb7 100644 --- a/gcc/cp/vec.cc +++ b/gcc/cp/vec.cc @@ -40,7 +40,7 @@ namespace __cxxabiv1 { /* allocate and construct array */ -extern "C++" void * +extern "C" void * __cxa_vec_new (size_t element_count, size_t element_size, size_t padding_size, @@ -70,7 +70,7 @@ __cxa_vec_new (size_t element_count, } /* construct array */ -extern "C++" void +extern "C" void __cxa_vec_ctor (void *array_address, size_t element_count, size_t element_size, @@ -96,7 +96,7 @@ __cxa_vec_ctor (void *array_address, /* construct an array by copying */ -extern "C++" void +extern "C" void __cxa_vec_cctor (void *dest_array, void *src_array, size_t element_count, @@ -124,7 +124,7 @@ __cxa_vec_cctor (void *dest_array, } /* destruct array */ -extern "C++" void +extern "C" void __cxa_vec_dtor (void *array_address, size_t element_count, size_t element_size, @@ -160,7 +160,7 @@ __cxa_vec_dtor (void *array_address, } /* destruct and release array */ -extern "C++" void +extern "C" void __cxa_vec_delete (void *array_address, size_t element_size, size_t padding_size,