From 2f6daf931b673b44d6e0b5937639ac914ae1e3cf Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Sat, 3 Apr 2021 06:09:59 +0000 Subject: [PATCH] {qmss, cppi, srio, pa, sa}-lld-test: suppress gcc10 multiple definition of fw_qmss* Workaround for these: .../ti/drv/cppi/test/k2h/armv7/linux/fw_main.c:50: multiple definition of `coreNum'; ./obj/k2h/cppi/test/cppi_test.o:.../ti/drv/cppi/test/src/cppi_test.c:102: first defined here .../ti/drv/cppi/test/k2h/armv7/linux/fw_main.c:50: multiple definition of `errorCount'; ./obj/k2h/cppi/test/cppi_test.o:.../ti/drv/cppi/test/src/cppi_test.c:102: first defined here .../ti/drv/cppi/test/k2h/armv7/linux/fw_test.h:85: multiple definition of `fw_passCfgVaddr'; ./obj/k2h/cppi/test/cppi_test.o:.../ti/drv/cppi/test/k2h/armv7/linux/fw_test.h:85: first defined here .../ti/drv/cppi/test/k2h/armv7/linux/fw_test.h:84: multiple definition of `fw_srioCfgVaddr'; ./obj/k2h/cppi/test/cppi_test.o:.../ti/drv/cppi/test/k2h/armv7/linux/fw_test.h:84: first defined here .../ti/drv/cppi/test/k2h/armv7/linux/fw_test.h:83: multiple definition of `fw_qmssDataVaddr'; ./obj/k2h/cppi/test/cppi_test.o:.../ti/drv/cppi/test/k2h/armv7/linux/fw_test.h:83: first defined here .../ti/drv/cppi/test/k2h/armv7/linux/fw_test.h:82: multiple definition of `fw_qmssCfgVaddr'; ./obj/k2h/cppi/test/cppi_test.o:.../ti/drv/cppi/test/k2h/armv7/linux/fw_test.h:82: first defined here Needs to be fixed properly later: https://gcc.gnu.org/gcc-10/porting_to.html Signed-off-by: Denys Dmytriyenko --- recipes-bsp/cppi-lld/cppi-lld-test_git.bb | 2 ++ recipes-bsp/pa-lld/pa-lld-test_git.bb | 2 ++ recipes-bsp/qmss-lld/qmss-lld-test_git.bb | 2 ++ recipes-bsp/sa-lld/sa-lld-test_git.bb | 2 ++ recipes-bsp/srio-lld/srio-lld-test_git.bb | 2 ++ 5 files changed, 10 insertions(+) diff --git a/recipes-bsp/cppi-lld/cppi-lld-test_git.bb b/recipes-bsp/cppi-lld/cppi-lld-test_git.bb index b4f5c239..0c630b4e 100644 --- a/recipes-bsp/cppi-lld/cppi-lld-test_git.bb +++ b/recipes-bsp/cppi-lld/cppi-lld-test_git.bb @@ -7,6 +7,8 @@ PR = "${INC_PR}.0" CHOICELIST = "yes no" +CFLAGS += "-fcommon" + do_compile () { # Now build the lld in the updated directory for device in ${DEVICELIST} diff --git a/recipes-bsp/pa-lld/pa-lld-test_git.bb b/recipes-bsp/pa-lld/pa-lld-test_git.bb index 62ec1222..760f1882 100644 --- a/recipes-bsp/pa-lld/pa-lld-test_git.bb +++ b/recipes-bsp/pa-lld/pa-lld-test_git.bb @@ -8,6 +8,8 @@ PR = "${INC_PR}.1" CHOICELIST = "yes no" +CC += "-fcommon" + do_compile () { # Now build the lld unit test examples for device in ${DEVICELIST} diff --git a/recipes-bsp/qmss-lld/qmss-lld-test_git.bb b/recipes-bsp/qmss-lld/qmss-lld-test_git.bb index 77e698a4..53f6dcff 100644 --- a/recipes-bsp/qmss-lld/qmss-lld-test_git.bb +++ b/recipes-bsp/qmss-lld/qmss-lld-test_git.bb @@ -8,6 +8,8 @@ PR = "${INC_PR}.2" CHOICELIST = "yes no" +CFLAGS += "-fcommon" + do_compile () { # Now build the lld in the updated directory for device in ${DEVICELIST} diff --git a/recipes-bsp/sa-lld/sa-lld-test_git.bb b/recipes-bsp/sa-lld/sa-lld-test_git.bb index f3fa4f3d..b9050b6a 100644 --- a/recipes-bsp/sa-lld/sa-lld-test_git.bb +++ b/recipes-bsp/sa-lld/sa-lld-test_git.bb @@ -14,6 +14,8 @@ DEVICELIST_k2e = "k2e" CHOICELIST = "no yes" +CFLAGS += "-fcommon" + PARALLEL_MAKE = "" EXTRA_OEMAKE = "-f makefile_armv7 PDK_INSTALL_PATH=${STAGING_INCDIR} SA_SRC_DIR=${S}" diff --git a/recipes-bsp/srio-lld/srio-lld-test_git.bb b/recipes-bsp/srio-lld/srio-lld-test_git.bb index d2a00682..ca22b7d5 100644 --- a/recipes-bsp/srio-lld/srio-lld-test_git.bb +++ b/recipes-bsp/srio-lld/srio-lld-test_git.bb @@ -7,6 +7,8 @@ PR = "${INC_PR}.0" CHOICELIST = "yes no" +CFLAGS += "-fcommon" + do_compile () { # Now build the lld in the updated directory for device in ${DEVICELIST}