fix merge

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
2021-08-05 17:33:52 +02:00
14 changed files with 790 additions and 2 deletions

View File

@@ -665,6 +665,7 @@ CT_CC_LANG_OTHERS=""
#
# Debug facilities
#
<<<<<<< HEAD
CT_DEBUG_DUMA=y
CT_DEBUG_DUMA_PKG_KSYM="DUMA"
CT_DUMA_DIR_NAME="duma"
@@ -722,6 +723,27 @@ CT_GDB_8_3_or_later=y
CT_GDB_later_than_8_0=y
CT_GDB_8_0_or_later=y
CT_GDB_later_than_7_12=y
=======
# CT_DEBUG_duma is not set
CT_DEBUG_gdb=y
CT_GDB_CROSS=y
# CT_GDB_CROSS_STATIC is not set
CT_GDB_CROSS_SIM=y
CT_GDB_CROSS_PYTHON=n
CT_GDB_CROSS_PYTHON_BINARY=""
CT_GDB_CROSS_EXTRA_CONFIG_ARRAY=""
# CT_GDB_NATIVE is not set
CT_GDB_GDBSERVER=y
CT_GDB_GDBSERVER_HAS_IPA_LIB=y
# CT_GDB_GDBSERVER_BUILD_IPA_LIB is not set
#
# gdb version
#
CT_GDB_VERSION="7.12.1"
CT_GDB_V_7_12_1=y
# CT_GDB_V_7_11_1 is not set
>>>>>>> 9adf96c16b00759a9f7f69be3e61b5e16cdd6ac4
CT_GDB_7_12_or_later=y
CT_GDB_later_than_7_2=y
CT_GDB_7_2_or_later=y
@@ -737,7 +759,11 @@ CT_GDB_GDBSERVER=y
# CT_GDB_NATIVE_STATIC is not set
# CT_GDB_NATIVE_STATIC_LIBSTDCXX is not set
CT_GDB_HAS_PKGVERSION_BUGURL=y
<<<<<<< HEAD
# CT_GDB_HAS_PYTHON is not set
=======
CT_GDB_HAS_PYTHON=n
>>>>>>> 9adf96c16b00759a9f7f69be3e61b5e16cdd6ac4
CT_GDB_INSTALL_GDBINIT=y
CT_GDB_HAS_IPA_LIB=y
CT_DEBUG_LTRACE=y