浏览代码

musl on mips is O32 ABI only

Waldemar Brodkorb 12 年之前
父节点
当前提交
e7e496c7ec
共有 2 个文件被更改,包括 14 次插入0 次删除
  1. 2 0
      target/config/Config.in
  2. 12 0
      toolchain/musl/patches/mips64.patch

+ 2 - 0
target/config/Config.in

@@ -83,6 +83,7 @@ depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS
 config ADK_TARGET_ABI_N32
 	boolean "N32 ABI (new)"
 	select ADK_n32
+	depends on !ADK_TARGET_LIB_MUSL
 
 config ADK_TARGET_ABI_O32
 	boolean "O32 ABI (old)"
@@ -91,6 +92,7 @@ config ADK_TARGET_ABI_O32
 config ADK_TARGET_ABI_N64
 	boolean "N64 ABI"
 	select ADK_n64
+	depends on !ADK_TARGET_LIB_MUSL
 
 endchoice
 

+ 12 - 0
toolchain/musl/patches/mips64.patch

@@ -0,0 +1,12 @@
+diff -Nur musl-0.9.14.orig/configure musl-0.9.14/configure
+--- musl-0.9.14.orig/configure	2013-09-23 23:01:11.000000000 +0200
++++ musl-0.9.14/configure	2013-11-09 20:16:14.000000000 +0100
+@@ -225,7 +225,7 @@
+ arm*) ARCH=arm ;;
+ i?86*) ARCH=i386 ;;
+ x86_64*) ARCH=x86_64 ;;
+-mips-*|mipsel-*) ARCH=mips ;;
++mips-*|mipsel-*|mips64-*|mips64el-*) ARCH=mips ;;
+ microblaze-*) ARCH=microblaze ;;
+ powerpc-*) ARCH=powerpc ;;
+ unknown) fail "$0: unable to detect target arch; try $0 --target=..." ;;