Skip to content

Fix detection of 32bit ARM builds on Aarch64#14920

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
StefanBruens:fix_arm_on_aarch64_detection
Jun 29, 2019
Merged

Fix detection of 32bit ARM builds on Aarch64#14920
opencv-pushbot merged 1 commit intoopencv:3.4from
StefanBruens:fix_arm_on_aarch64_detection

Conversation

@StefanBruens
Copy link
Copy Markdown
Contributor

It is perfectly possible to compile ARM binaries on Aarch64. Generalize
the code to no only swap X86 with X86_64, but also ARM and AARCH64.

Signed-off-by: Stefan Brüns stefan.bruens@rwth-aachen.de

@alalek
Copy link
Copy Markdown
Member

alalek commented Jun 28, 2019

Thank you for contribution!

This patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@StefanBruens StefanBruens changed the base branch from master to 3.4 June 28, 2019 12:12
It is perfectly possible to compile ARM binaries on Aarch64. Generalize
the code to no only swap X86 with X86_64, but also ARM and AARCH64.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
@StefanBruens StefanBruens force-pushed the fix_arm_on_aarch64_detection branch from 2de5eb3 to e10c010 Compare June 28, 2019 12:17
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Looks good to me 👍

@opencv-pushbot opencv-pushbot merged commit e10c010 into opencv:3.4 Jun 29, 2019
@alalek alalek mentioned this pull request Jun 29, 2019
@StefanBruens StefanBruens deleted the fix_arm_on_aarch64_detection branch June 29, 2019 21:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants