Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for macOS on ARM #1971

Merged
merged 1 commit into from
Jul 1, 2020
Merged

Fix for macOS on ARM #1971

merged 1 commit into from
Jul 1, 2020

Conversation

grhoten
Copy link
Contributor

@grhoten grhoten commented Jun 29, 2020

These changes resolve compilation issues for the Catch headers when compiling with macOS on ARM, which is not x86/x86_64 based. The changes are similar to the "elif defined(CATCH_PLATFORM_IPHONE)" logic later in these files. ARM based macOS machines were already announced at Apple's WWDC.

The error being resolved looks like the following:

catch.hpp:8237:13: error: invalid token in expression
            CATCH_BREAK_INTO_DEBUGGER();
            ^
catch.hpp:7948:83: note: expanded from macro 'CATCH_BREAK_INTO_DEBUGGER'
        #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
                                                                                  ^
catch.hpp:7913:34: note: expanded from macro 'CATCH_TRAP'
    #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
                                 ^
<inline asm>:1:6: note: instantiated into assembly here
        int $3
            ^

@codecov
Copy link

codecov bot commented Jun 29, 2020

Codecov Report

Merging #1971 into master will increase coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1971      +/-   ##
==========================================
+ Coverage   88.61%   88.62%   +0.01%     
==========================================
  Files         138      138              
  Lines        5627     5624       -3     
==========================================
- Hits         4986     4984       -2     
+ Misses        641      640       -1     

@horenmar
Copy link
Member

horenmar commented Jul 1, 2020

Thanks for the patch. Do note, that as per the contributing docs files in the single_include should not be changed as part of a PR.

@grhoten
Copy link
Contributor Author

grhoten commented Jul 1, 2020

I have reverted the change to single_include.

@horenmar horenmar merged commit bad3c93 into catchorg:master Jul 1, 2020
@horenmar horenmar added the Tweak label Jul 1, 2020
pramodk added a commit to BlueBrain/nmodl that referenced this pull request Feb 27, 2021
 - Currently catch2 is header directly added in the project
 - Before switching to submodule (in separate PR), copying
   minimal fix from the upstream: catchorg/Catch2#1971

Fixes #527
pramodk added a commit to BlueBrain/nmodl that referenced this pull request Feb 27, 2021
 - Currently catch2 is header directly added in the project
 - Before switching to submodule (in separate PR), copying
   minimal fix from the upstream: catchorg/Catch2#1971
 - Update INSTALL.md for Apple M1

Fixes #527
pramodk added a commit to BlueBrain/nmodl that referenced this pull request Mar 5, 2021
 - Currently catch2 is header directly added in the project
 - Before switching to submodule (in separate PR), copying
   minimal fix from the upstream: catchorg/Catch2#1971
 - Update INSTALL.md for Apple M1

Fixes #527
pramodk added a commit to BlueBrain/nmodl that referenced this pull request Mar 7, 2021
* Currently catch2 is header directly added in the project
 - Before switching to submodule (in separate PR), copying
   minimal fix from the upstream: catchorg/Catch2#1971
* Update INSTALL.md for Apple M1

fixes #527
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants