libs: Move libxx_impure.cxx from libs/libxx/ to libs/libc/misc/

to fix the gcov link error:
arm-none-eabi-ld: /home/xiaoxiang/vela/prebuilts/gcc/linux/arm/bin/../lib/gcc/arm-none-eabi/10.3.1/thumb/v7e-m/nofp/libgcov.a(_gcov.o): in function `gcov_error_exit':
libgcov-driver.c:(.text+0x7c): undefined reference to `_impure_ptr'
arm-none-eabi-ld: /home/xiaoxiang/vela/prebuilts/gcc/linux/arm/bin/../lib/gcc/arm-none-eabi/10.3.1/thumb/v7e-m/nofp/libgcov.a(_gcov.o): in function `get_gcov_error_file':
libgcov-driver.c:(.text+0x1e0): undefined reference to `_impure_ptr'
arm-none-eabi-ld: /home/xiaoxiang/vela/prebuilts/gcc/linux/arm/bin/../lib/gcc/arm-none-eabi/10.3.1/thumb/v7e-m/nofp/libgcov.a(_gcov.o): in function `gcov_exit_open_gcda_file.isra.0':
libgcov-driver.c:(.text+0x660): undefined reference to `_impure_ptr'

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-05-03 17:49:10 +08:00 committed by Alan Carvalho de Assis
parent e84e5f0e1d
commit 4ae7f4c1f6
4 changed files with 73 additions and 65 deletions

View File

@ -22,7 +22,7 @@
CSRCS += lib_mknod.c lib_umask.c lib_utsname.c lib_getrandom.c
CSRCS += lib_xorshift128.c lib_tea_encrypt.c lib_tea_decrypt.c
CSRCS += lib_cxx_initialize.c
CSRCS += lib_cxx_initialize.c lib_impure.c
# Support for platforms that do not have long long types

View File

@ -0,0 +1,71 @@
/****************************************************************************
* libs/libc/misc/lib_impure.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#if defined(__has_include)
# if __has_include(<reent.h>)
#include <reent.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#ifndef __ATTRIBUTE_IMPURE_PTR__
# define __ATTRIBUTE_IMPURE_PTR__
#endif
#ifndef __ATTRIBUTE_IMPURE_DATA__
# define __ATTRIBUTE_IMPURE_DATA__
#endif
/****************************************************************************
* Public Functions
****************************************************************************/
#ifdef _REENT_SMALL
extern const struct __sFILE_fake __sf_fake_stdin _ATTRIBUTE((weak));
extern const struct __sFILE_fake __sf_fake_stdout _ATTRIBUTE((weak));
extern const struct __sFILE_fake __sf_fake_stderr _ATTRIBUTE((weak));
#endif
static struct _reent __ATTRIBUTE_IMPURE_DATA__
impure_data = _REENT_INIT(impure_data);
#ifdef __CYGWIN__
extern struct _reent reent_data __attribute__((alias("impure_data")));
#endif
struct _reent *__ATTRIBUTE_IMPURE_PTR__
_impure_ptr = &impure_data;
#ifdef CONFIG_ARCH_XTENSA
struct _reent *__ATTRIBUTE_IMPURE_PTR__
_global_impure_ptr = &impure_data;
#else
struct _reent *const __ATTRIBUTE_IMPURE_PTR__
_global_impure_ptr = &impure_data;
#endif
# endif /* __has_include(<reent.h>) */
#endif /* defined(__has_include) */

View File

@ -41,9 +41,7 @@ ifeq ($(CONFIG_LIBCXXABI),y)
include libcxxabi.defs
endif
ifeq ($(CONFIG_LIBSUPCXX),y)
CXXSRCS += libxx_impure.cxx
else
ifneq ($(CONFIG_LIBSUPCXX),y)
CXXSRCS += libxx_eabi_atexit.cxx
endif

View File

@ -1,61 +0,0 @@
//***************************************************************************
// libs/libxx/libxx_impure.cxx
//
// Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed with
// this work for additional information regarding copyright ownership. The
// ASF licenses this file to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance with the
// License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
// License for the specific language governing permissions and limitations
// under the License.
//
//***************************************************************************
//***************************************************************************
// Included Files
//***************************************************************************
#if defined(__has_include) && __has_include(<reent.h>)
#include <reent.h>
//***************************************************************************
// Pre-processor Definitions
//***************************************************************************
#ifndef __ATTRIBUTE_IMPURE_PTR__
#define __ATTRIBUTE_IMPURE_PTR__
#endif
#ifndef __ATTRIBUTE_IMPURE_DATA__
#define __ATTRIBUTE_IMPURE_DATA__
#endif
//***************************************************************************
// Public Data
//***************************************************************************
extern "C"
{
#ifdef _REENT_SMALL
extern const struct __sFILE_fake __sf_fake_stdin _ATTRIBUTE ((weak));
extern const struct __sFILE_fake __sf_fake_stdout _ATTRIBUTE ((weak));
extern const struct __sFILE_fake __sf_fake_stderr _ATTRIBUTE ((weak));
#endif
static struct _reent __ATTRIBUTE_IMPURE_DATA__ impure_data = _REENT_INIT (impure_data);
#ifdef __CYGWIN__
extern struct _reent reent_data __attribute__ ((alias("impure_data")));
#endif
struct _reent *__ATTRIBUTE_IMPURE_PTR__ _impure_ptr = &impure_data;
struct _reent *const __ATTRIBUTE_IMPURE_PTR__ _global_impure_ptr = &impure_data;
}
#endif