From 60db5d33817ce7b0391dbc1ebddb9e3b0c361b7d Mon Sep 17 00:00:00 2001 From: pankore <86098180+pankore@users.noreply.github.com> Date: Fri, 13 Jan 2023 18:42:05 +0800 Subject: [PATCH] [Build] Remove __dso_hack (#24183) - this has been defined in ameba SDK --- .../all-clusters-app/ameba/chip_main.cmake | 1 - .../all-clusters-app/ameba/main/DsoHack.cpp | 20 ------------------- examples/chef/ameba/chip_main.cmake | 1 - examples/chef/ameba/main/DsoHack.cpp | 20 ------------------- .../light-switch-app/ameba/chip_main.cmake | 1 - .../light-switch-app/ameba/main/DsoHack.cpp | 20 ------------------- examples/lighting-app/ameba/chip_main.cmake | 1 - examples/lighting-app/ameba/main/DsoHack.cpp | 20 ------------------- .../ameba/main/chipinterface.cpp | 2 -- 9 files changed, 86 deletions(-) delete mode 100644 examples/all-clusters-app/ameba/main/DsoHack.cpp delete mode 100644 examples/chef/ameba/main/DsoHack.cpp delete mode 100644 examples/light-switch-app/ameba/main/DsoHack.cpp delete mode 100644 examples/lighting-app/ameba/main/DsoHack.cpp diff --git a/examples/all-clusters-app/ameba/chip_main.cmake b/examples/all-clusters-app/ameba/chip_main.cmake index a57e9f2f026284..7241e44892de85 100755 --- a/examples/all-clusters-app/ameba/chip_main.cmake +++ b/examples/all-clusters-app/ameba/chip_main.cmake @@ -160,7 +160,6 @@ list( ${chip_dir}/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp ${chip_dir}/examples/all-clusters-app/ameba/main/Globals.cpp ${chip_dir}/examples/all-clusters-app/ameba/main/LEDWidget.cpp - ${chip_dir}/examples/all-clusters-app/ameba/main/DsoHack.cpp ${chip_dir}/examples/platform/ameba/route_hook/ameba_route_hook.c ${chip_dir}/examples/platform/ameba/route_hook/ameba_route_table.c diff --git a/examples/all-clusters-app/ameba/main/DsoHack.cpp b/examples/all-clusters-app/ameba/main/DsoHack.cpp deleted file mode 100644 index 6fc5d7a63307c5..00000000000000 --- a/examples/all-clusters-app/ameba/main/DsoHack.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2021 Project CHIP Authors - * - * Licensed 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. - */ - -// This hack is needed because Ameba SDK is not linking against libstdc++ correctly. -extern "C" { -void * __dso_handle = 0; -} diff --git a/examples/chef/ameba/chip_main.cmake b/examples/chef/ameba/chip_main.cmake index 22c6e2dbc89818..b4f4c0318eba1f 100755 --- a/examples/chef/ameba/chip_main.cmake +++ b/examples/chef/ameba/chip_main.cmake @@ -42,7 +42,6 @@ list( ${matter_example_path}//main/CHIPDeviceManager.cpp ${matter_example_path}//main/Globals.cpp ${matter_example_path}//main/LEDWidget.cpp - ${matter_example_path}//main/DsoHack.cpp ${chip_dir}/examples/providers/DeviceInfoProviderImpl.cpp ) diff --git a/examples/chef/ameba/main/DsoHack.cpp b/examples/chef/ameba/main/DsoHack.cpp deleted file mode 100644 index 6fc5d7a63307c5..00000000000000 --- a/examples/chef/ameba/main/DsoHack.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2021 Project CHIP Authors - * - * Licensed 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. - */ - -// This hack is needed because Ameba SDK is not linking against libstdc++ correctly. -extern "C" { -void * __dso_handle = 0; -} diff --git a/examples/light-switch-app/ameba/chip_main.cmake b/examples/light-switch-app/ameba/chip_main.cmake index 3306cbf5233559..19f592d882929f 100755 --- a/examples/light-switch-app/ameba/chip_main.cmake +++ b/examples/light-switch-app/ameba/chip_main.cmake @@ -157,7 +157,6 @@ list( ${chip_dir}/examples/light-switch-app/ameba/main/CHIPDeviceManager.cpp ${chip_dir}/examples/light-switch-app/ameba/main/Globals.cpp ${chip_dir}/examples/light-switch-app/ameba/main/LEDWidget.cpp - ${chip_dir}/examples/light-switch-app/ameba/main/DsoHack.cpp ${chip_dir}/examples/providers/DeviceInfoProviderImpl.cpp ) diff --git a/examples/light-switch-app/ameba/main/DsoHack.cpp b/examples/light-switch-app/ameba/main/DsoHack.cpp deleted file mode 100644 index 6fc5d7a63307c5..00000000000000 --- a/examples/light-switch-app/ameba/main/DsoHack.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2021 Project CHIP Authors - * - * Licensed 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. - */ - -// This hack is needed because Ameba SDK is not linking against libstdc++ correctly. -extern "C" { -void * __dso_handle = 0; -} diff --git a/examples/lighting-app/ameba/chip_main.cmake b/examples/lighting-app/ameba/chip_main.cmake index 816fd869819fc5..db7ec9beec2200 100755 --- a/examples/lighting-app/ameba/chip_main.cmake +++ b/examples/lighting-app/ameba/chip_main.cmake @@ -150,7 +150,6 @@ list( ${chip_dir}/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp ${chip_dir}/examples/lighting-app/ameba/main/Globals.cpp ${chip_dir}/examples/lighting-app/ameba/main/LEDWidget.cpp - ${chip_dir}/examples/lighting-app/ameba/main/DsoHack.cpp ${chip_dir}/examples/providers/DeviceInfoProviderImpl.cpp ) diff --git a/examples/lighting-app/ameba/main/DsoHack.cpp b/examples/lighting-app/ameba/main/DsoHack.cpp deleted file mode 100644 index 6fc5d7a63307c5..00000000000000 --- a/examples/lighting-app/ameba/main/DsoHack.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2021 Project CHIP Authors - * - * Licensed 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. - */ - -// This hack is needed because Ameba SDK is not linking against libstdc++ correctly. -extern "C" { -void * __dso_handle = 0; -} diff --git a/examples/ota-requestor-app/ameba/main/chipinterface.cpp b/examples/ota-requestor-app/ameba/main/chipinterface.cpp index fa9ff27da75887..865d98c1a165cd 100644 --- a/examples/ota-requestor-app/ameba/main/chipinterface.cpp +++ b/examples/ota-requestor-app/ameba/main/chipinterface.cpp @@ -35,8 +35,6 @@ #include #include -void * __dso_handle = 0; - using chip::ByteSpan; using chip::EndpointId; using chip::FabricIndex;