Skip to content

[BACKPORT #2265/#2267/#2281] sim: Remove cxxtest specifial Make.defs#2290

Merged
Ouss4 merged 3 commits into
apache:releases/10.0from
btashton:bp-2281
Nov 13, 2020
Merged

[BACKPORT #2265/#2267/#2281] sim: Remove cxxtest specifial Make.defs#2290
Ouss4 merged 3 commits into
apache:releases/10.0from
btashton:bp-2281

Conversation

@btashton

@btashton btashton commented Nov 13, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

Summary

Backports #2265 #2267 #2281

Impact

Fixes #2086 sim:cxxtest build failure

Testing

sim:cxxtesting

@btashton

btashton commented Nov 13, 2020

Copy link
Copy Markdown
Contributor Author

@xiaoxiang781216 I think there is something else necessary for this backport besides what was in the PR:

cxxtest_main.cxx: In function ‘void test_rtti()’:
cxxtest_main.cxx:193:15: error: ‘dynamic_cast’ not permitted with ‘-fno-rtti’
  193 |   Extend *t = dynamic_cast<Extend *>(a);
      |               ^~~~~~~~~~~~~~~~~~~~~~~~~
cxxtest_main.cxx:196:7: error: ‘dynamic_cast’ not permitted with ‘-fno-rtti’
  196 |   t = dynamic_cast<Extend *>(b);

@xiaoxiang781216

xiaoxiang781216 commented Nov 13, 2020

Copy link
Copy Markdown
Contributor

@btashton please cherry-pick these patches: #2267, #2265.

@btashton

btashton commented Nov 13, 2020

Copy link
Copy Markdown
Contributor Author

@btashton please cherry-pick these patches: #2267, #2265.

Thanks I'll update it in a bit.

anchao and others added 3 commits November 12, 2020 23:43
@anchao @btashton
boards/sim: enable run-time type identification
6cc01a7 
BTW, correct some cxx compilation options

Change-Id: Id3e3eab2020ef1991d2760426d81b40e6e5eff4e
Signed-off-by: chao.an <anchao@xiaomi.com>
@anchao @btashton
boards/sim: correct the ARCHDEFINES definition
631ebdd 
ARCHDEFINESXX -> ARCHDEFINES

Signed-off-by: chao.an <anchao@xiaomi.com>
@xiaoxiang781216 @btashton
sim: Remove cxxtest specifial Make.defs
619bc69 
since the special c++ setup doesn't need anymore

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
@btashton btashton changed the title [BACKPORT #2281] sim: Remove cxxtest specifial Make.defs [BACKPORT #2265/#2267/#2281] sim: Remove cxxtest specifial Make.defs Nov 13, 2020
@btashton

btashton commented Nov 13, 2020

Copy link
Copy Markdown
Contributor Author

@xiaoxiang781216 I have added all three patches and tested it locally. Thank you.

@btashton btashton linked an issue Nov 13, 2020 that may be closed by this pull request
sim:cxxtest Build Broken #2086
Closed
xiaoxiang781216
xiaoxiang781216 reviewed Nov 13, 2020
View reviewed changes

@xiaoxiang781216 xiaoxiang781216 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@Ouss4 Ouss4 merged commit c3c4e92 into apache:releases/10.0 Nov 13, 2020
@btashton btashton deleted the bp-2281 branch December 30, 2020 01:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@xiaoxiang781216 xiaoxiang781216 xiaoxiang781216 left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

sim:cxxtest Build Broken

4 participants

@btashton @xiaoxiang781216 @Ouss4 @anchao