diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
| commit | 27a5414804f7b8ab41101aad219ebef02d364bde (patch) | |
| tree | c9535dfed260314855b3ba1fe2c75652fdf60a1a /Makefile | |
| parent | f6162290fb6800fecffb86eed42069aa0f813f87 (diff) | |
| parent | fc90fa9417d8b99b5d1c77aaa9e4c9ac4c8c7c58 (diff) | |
Merge branch 'next'
Conflicts:
package/gdb/Config.in.host
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -38,7 +38,7 @@ export HOSTARCH := $(shell uname -m | \ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ \ -e s/sa110/arm/ \ - -e s/ppc64/powerpc/ \ + -e s/ppc64/powerpc64/ \ -e s/ppc/powerpc/ \ -e s/macppc/powerpc/\ -e s/sh.*/sh/) @@ -309,7 +309,7 @@ KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \ -e s/aarch64/arm64/ \ -e s/bfin/blackfin/ \ -e s/parisc64/parisc/ \ - -e s/powerpc64/powerpc/ \ + -e s/powerpc64.*/powerpc/ \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ -e s/sh.*/sh/ \ -e s/microblazeel/microblaze/) |