Skip to content

build: use arm64 as DESTCPU for aarch64 #22548

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.

Sign up for GitHub

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

Closed
danbev wants to merge 2 commits into from
Closed

build: use arm64 as DESTCPU for aarch64 #22548

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc22831
build: use arm64 as DESTCPU for aarch64
danbev Aug 27, 2018
1dedf3f
squash: update DESTCPU check for ARCH setting
danbev Aug 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
build: use arm64 as DESTCPU for aarch64 
On a `aarch64` system I can run the complete build with tests without
specifying the Makefile variable `DESTCPU`.

But when running the `tar-headers` target `DESTCPU` is passed to configure:
```shell
    $(PYTHON) ./configure \
               --prefix=/ \
               --dest-cpu=$(DESTCPU) \
               ...
```
The value of `DESTCPU` in this case will be 'aarch64' which will cause
configure to fail:
```shell
configure: error: option --dest-cpu: invalid choice: 'aarch64'
(choose from 'arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc',
'ppc64', 'x32', 'x64', 'x86', 'x86_64', 's390', 's390x')
```

In the configure script there is a matching of `__aarch64__` to `arm64`:
```shell
$ python -c 'from configure import host_arch_cc; print host_arch_cc()'
arm64
```

In our case it would be nice to have consitent behaviour for both of
these cases on `aarch64`.

This commit changes `DESTCPU` to `arm64` to be consistent with the
configure script. `DESTCPU` is used in `$(TARBALL)-headers` and in
`$(BINARYTAR)` but I'm not sure about the implications of making the
change purposed and hope others might chime in and provide some
guidance.
  • Loading branch information
@danbev
danbev committed Aug 27, 2018
commit fc228313f496af9a49ae9a56f6c0b9dbbb1a39ca
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ ifeq ($(findstring arm,$(UNAME_M)),arm)
DESTCPU ?= arm
else
ifeq ($(findstring aarch64,$(UNAME_M)),aarch64)
DESTCPU ?= aarch64
DESTCPU ?= arm64
else
ifeq ($(findstring powerpc,$(shell uname -p)),powerpc)
DESTCPU ?= ppc64
Expand Down