Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/image.mk

@@ -51,7 +51,6 @@ image-prepare-post:
 	-rm -f ${TARGET_DIR}/bin/sh
 	ln -sf ${BINSH} ${TARGET_DIR}/bin/sh
 ifeq ($(ADK_LINUX_X86_64),y)
-ifneq ($(ADK_TARGET_ABI_X32),y)
 	# fixup lib dirs
 	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
 	rm -rf ${TARGET_DIR}/lib/
@@ -61,7 +60,6 @@ ifneq ($(ADK_TARGET_ABI_X32),y)
 	rm -rf ${TARGET_DIR}/usr/lib/
 	(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
 endif
-endif
 ifeq ($(ADK_LINUX_PPC64),y)
 	# fixup lib dirs
 	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}

mk/vars.mk

@@ -10,40 +10,52 @@ MAKEFLAGS=		$(EXTRA_MAKEFLAGS)
 BUILD_USER=		$(shell id -un)
 BUILD_GROUP=		$(shell id -gn)
 
+# some global dirs
 BASE_DIR:=		$(TOPDIR)
 DISTDIR?=		${BASE_DIR}/dl
-BUILD_DIR:=		${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
+TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
+SCRIPT_DIR:=		$(BASE_DIR)/scripts
+STAGING_HOST_DIR:=	${BASE_DIR}/host_${GNU_HOST_NAME}
+
+# PFX dirs for cleandir
+FW_DIR_PFX:=		$(BASE_DIR)/firmware
 BUILD_DIR_PFX:=		$(BASE_DIR)/build_*
-STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_PKG_DIR_PFX:=	${BASE_DIR}/pkg_*
-STAGING_HOST_DIR:=	${BASE_DIR}/host_${GNU_HOST_NAME}
+STAGING_TARGET_DIR_PFX:=${BASE_DIR}/target_*
+TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
 STAGING_HOST_DIR_PFX:=	${BASE_DIR}/host_*
+TARGET_DIR_PFX:=	$(BASE_DIR)/root_*
+
 ifeq ($(ADK_TARGET_ABI),)
+TARGET_DIR:=		$(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
+FW_DIR:=		$(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
+BUILD_DIR:=		${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_TARGET_DIR:=	${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_DIR:=		${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
+STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_LIBC}
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}
 else
+TARGET_DIR:=		$(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
+FW_DIR:=		$(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
+BUILD_DIR:=		${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 STAGING_TARGET_DIR:=	${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 STAGING_DIR:=		${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
+STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_ABI}
 endif
-SCRIPT_TARGET_DIR:=	${STAGING_TARGET_DIR}/scripts
+
-STAGING_TARGET_DIR_PFX:=${BASE_DIR}/target_*
-TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
-TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
-SCRIPT_DIR:=		$(BASE_DIR)/scripts
-FW_DIR:=		$(BASE_DIR)/firmware/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
-FW_DIR_PFX:=		$(BASE_DIR)/firmware
 PACKAGE_DIR:=		$(FW_DIR)/packages
-TARGET_DIR:=		$(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
+SCRIPT_TARGET_DIR:=	${STAGING_TARGET_DIR}/scripts
-TARGET_DIR_PFX:=	$(BASE_DIR)/root_*
+
+# PATH variables
 TARGET_PATH=		${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
 HOST_PATH=		${SCRIPT_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
 AUTOTOOL_PATH=		${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
+
 ifeq ($(ADK_TARGET_ABI_X32),y)
-GNU_TARGET_NAME=	$(CPU_ARCH)-x32-linux
+GNU_TARGET_NAME=	$(CPU_ARCH)-x32-linux-$(ADK_TARGET_SUFFIX)
 else
 GNU_TARGET_NAME=	$(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
 endif

package/cdrtools/Makefile

@@ -12,6 +12,8 @@ PKG_SECTION:=		misc
 PKG_URL:=		http://cdrecord.berlios.de/private/cdrecord.html
 PKG_SITES:=		http://openadk.org/
 
+PKG_CFLINE_CDRTOOLS:=	depends on ADK_BROKEN
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CDRTOOLS,cdrtools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/jikes/Makefile

@@ -8,6 +8,7 @@ PKG_VERSION:=		1.22
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		cda958c7fef6b43b803e1d1ef9afcb85
 PKG_DESCR:=		jikes java compiler
+PKG_BUILDDEP:=		jikes-host
 PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
 
@@ -17,6 +18,7 @@ include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 HOST_STYLE:=		auto
 
@@ -26,6 +28,7 @@ hostpost-install:
 	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/bin/javac
 	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/javac
 
+jikes-install:
 
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

target/config/Config.in

@@ -71,6 +71,10 @@ config ADK_TOOLCHAIN
 source "target/config/Config.in.arch"
 source "target/config/Config.in.system"
 
+config ADK_LINUX_MIPS64
+	boolean
+	default y if ADK_LINUX_MIPS && ADK_TARGET_KERNEL64
+
 choice
 prompt "Toolchain options"
 depends on ADK_TOOLCHAIN
@@ -87,8 +91,6 @@ prompt "Target Kernel"
 depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG \
 	|| ADK_TARGET_SYSTEM_QEMU_MIPS64 \
 	|| ADK_TARGET_SYSTEM_QEMU_MIPS64EL \
-	|| ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64 \
-	|| ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64EL \
 	|| ADK_LINUX_X86_64
 
 config ADK_TARGET_KERNEL64
@@ -133,26 +135,19 @@ config ADK_TARGET_ABI
 	default "eabihf" if ADK_eabihf
 
 config ADK_TARGET_MIPS_ABI
-	depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS
+	depends on ADK_LINUX_MIPS
 	string
 	default "32" if ADK_o32
 	default "n32" if ADK_n32
 	default "64" if ADK_n64
 
-config ADK_TARGET_ABI_MIPS_O32
-	boolean
-	select ADK_o32
-	depends on !ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS
-	default y
-
 choice
 prompt "Target ABI"
-depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS
+depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN
 
 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)"
@@ -161,13 +156,12 @@ config ADK_TARGET_ABI_O32
 config ADK_TARGET_ABI_N64
 	boolean "N64 ABI"
 	select ADK_n64
-	depends on !ADK_TARGET_LIB_MUSL
 
 endchoice
 
 choice
 prompt "Target ABI"
-depends on ADK_TARGET_KERNEL64 && ADK_LINUX_X86_64
+depends on ADK_TARGET_KERNEL64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN
 
 config ADK_TARGET_ABI_64
 	boolean "64 Bit ABI"
@@ -558,8 +552,8 @@ config ADK_TARGET_CPU_ARCH
 	default "m68k" if ADK_LINUX_M68K
 	default "microblaze" if ADK_LINUX_MICROBLAZE && ADK_big
 	default "microblazeel" if ADK_LINUX_MICROBLAZE && ADK_little
-	default "mips64" if ADK_LINUX_MIPS && ADK_big && ADK_TARGET_KERNEL64
+	default "mips64" if ADK_LINUX_MIPS && ADK_big && ADK_LINUX_64
-	default "mips64el" if ADK_LINUX_MIPS && ADK_little && ADK_TARGET_KERNEL64
+	default "mips64el" if ADK_LINUX_MIPS && ADK_little && ADK_LINUX_64
 	default "mips" if ADK_LINUX_MIPS && ADK_big
 	default "mipsel" if ADK_LINUX_MIPS && ADK_little
 	default "arm" if ADK_LINUX_ARM && ADK_little
@@ -570,26 +564,26 @@ config ADK_TARGET_CPU_ARCH
 	default "sh4eb" if ADK_LINUX_SH && ADK_big
 	default "ppc" if ADK_CPU_PPC
 	default "ppc64" if ADK_CPU_PPC64
-	default "mips64el" if ADK_native && ADK_lemote_yeelong	
+	default "mips64el" if ADK_native && ADK_lemote_yeelong
 
 config ADK_TARGET_ABI_CFLAGS
 	string
-	default "-mabi=32" if ADK_TARGET_ABI_O32 || ADK_TARGET_ABI_MIPS_O32
+	default "-mabi=32" if ADK_o32
-	default "-mabi=n32" if ADK_TARGET_ABI_N32
+	default "-mabi=n32" if ADK_n32
-	default "-mabi=64" if ADK_TARGET_ABI_N64
+	default "-mabi=64" if ADK_n64
-	default "-m32" if ADK_TARGET_ABI_32
+	default "-m32" if ADK_32
-	default "-mx32" if ADK_TARGET_ABI_X32
+	default "-mx32" if ADK_x32
-	default "-m64" if ADK_TARGET_ABI_64
+	default "-m64" if ADK_64
 
 config ADK_TARGET_ABI_LDFLAGS
 	string
-	default "-Wl,-m -Wl,elf_i386" if ADK_TARGET_ABI_32
+	default "-Wl,-m -Wl,elf_i386" if ADK_32
 
 config ADK_TARGET_KERNEL_LDFLAGS
 	string
-	default "-mabi=64" if ADK_TARGET_ABI_N32 && ADK_TARGET_KERNEL64
+	default "-mabi=64" if ADK_n32 && ADK_TARGET_KERNEL64
-	default "-mabi=64" if ADK_TARGET_ABI_O32 && ADK_TARGET_KERNEL64
+	default "-mabi=64" if ADK_o32 && ADK_TARGET_KERNEL64
-	default "-mabi=64" if ADK_TARGET_ABI_N64 && ADK_TARGET_KERNEL64
+	default "-mabi=64" if ADK_n64 && ADK_TARGET_KERNEL64
 	default ""
 
 config ADK_TARGET_CFLAGS
@@ -675,7 +669,7 @@ config ADK_TARGET_LIB_UCLIBC
 		   !ADK_LINUX_MICROBLAZE && \
 		   !ADK_LINUX_SPARC64 && \
 		   !ADK_LINUX_PPC64 && \
-		   !ADK_LINUX_NATIVE
+		   !ADK_TARGET_ABI_X32
 	help
  	 http://uclibc.org
 
@@ -685,7 +679,6 @@ config ADK_TARGET_LIB_GLIBC
 	select ADK_glibc
 	depends on \
 		ADK_LINUX_ARM || \
-		ADK_LINUX_ARMEB || \
 		ADK_LINUX_M68K || \
 		ADK_LINUX_MICROBLAZE || \
 		ADK_LINUX_MIPS || \
@@ -703,6 +696,7 @@ config ADK_TARGET_LIB_MUSL
 	prompt "musl C library"
 	boolean
 	select ADK_musl
+	depends on !ADK_LINUX_MIPS64
 	depends on \
 		ADK_LINUX_ARM || \
 		ADK_LINUX_MICROBLAZE || \
@@ -711,6 +705,7 @@ config ADK_TARGET_LIB_MUSL
 		ADK_LINUX_SH || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64
+		
 	help
  	 http://musl-libc.org
 
@@ -726,25 +721,25 @@ config ADK_TARGET_SUFFIX
 	string
 	default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_eabihf
 	default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_eabi
-	default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 && ADK_TARGET_KERNEL64
+	default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64
-	default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 && ADK_TARGET_KERNEL64
+	default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32
-	default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 && ADK_TARGET_KERNEL64
+	default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32
 	default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_TARGET_KERNEL64
 	default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_TARGET_KERNEL64
 	default "gnu" if ADK_TARGET_LIB_GLIBC
 	default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_eabihf
 	default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_eabi
-	default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64 && ADK_TARGET_KERNEL64
+	default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64
-	default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 && ADK_TARGET_KERNEL64
+	default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32
-	default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 && ADK_TARGET_KERNEL64
+	default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32
 	default "uclibc32" if ADK_TARGET_LIB_UCLIBC && ADK_32 && ADK_TARGET_KERNEL64
 	default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_TARGET_KERNEL64
 	default "uclibc" if ADK_TARGET_LIB_UCLIBC
 	default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_eabihf
 	default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_eabi
-	default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 && ADK_TARGET_KERNEL64
+	default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64
-	default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 && ADK_TARGET_KERNEL64
+	default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32
-	default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 && ADK_TARGET_KERNEL64
+	default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32
 	default "musl32" if ADK_TARGET_LIB_MUSL && ADK_32 && ADK_TARGET_KERNEL64
 	default "muslx32" if ADK_TARGET_LIB_MUSL && ADK_x32 && ADK_TARGET_KERNEL64
 	default "musl" if ADK_TARGET_LIB_MUSL

target/mips/sys-available/qemu-mips64

@@ -4,9 +4,8 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64
 	select ADK_big
 	select ADK_qemu_mips64
 	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_KERNEL_VMLINUZ
 	select ADK_USE_KERNEL_MINICONFIG
 	help

target/mips/sys-available/qemu-mips64el

@@ -4,12 +4,9 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64EL
 	select ADK_little
 	select ADK_qemu_mips64el
 	select ADK_CPU_MIPS64
-	select ADK_TARGET_KERNEL64
+	select ADK_LINUX_64
 	select ADK_HARDWARE_QEMU
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_KERNEL_VMLINUZ
 	select ADK_USE_KERNEL_MINICONFIG
 	help
 	 Qemu support for mips64 little endian architecture.
-

target/mips/sys-available/toolchain-mips64

@@ -1,10 +1,12 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64
-	bool "Toolchain only (mips64 big endian)"
+	bool "Toolchain only (mips64 big endian o32 ABI)"
 	select ADK_mips
 	select ADK_big
-	select ADK_CPU_MIPS64
+	select ADK_o32
 	select ADK_toolchain_mips64
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TGZ
 	help
-	  MIPS64 big endian toolchain.
+	  MIPS64 big endian o32 ABI toolchain.

target/mips/sys-available/toolchain-mips64el

@@ -1,10 +1,12 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64EL
-	bool "Toolchain only (mips64 little endian)"
+	bool "Toolchain only (mips64 little endian o32 ABI)"
 	select ADK_mips
 	select ADK_little
-	select ADK_CPU_MIPS64
+	select ADK_o32
 	select ADK_toolchain_mips64el
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
 	select ADK_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TGZ
 	help
-	  MIPS64 little endian toolchain.
+	  MIPS64 little endian o32 ABI toolchain.

target/mips/sys-available/toolchain-mips64eln32

@@ -0,0 +1,12 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64ELN32
+	bool "Toolchain only (mips64 little endian n32 ABI)"
+	select ADK_mips
+	select ADK_little
+	select ADK_n32
+	select ADK_toolchain_mips64el
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
+	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
+	help
+	  MIPS64 little endian n32 ABI toolchain.

target/mips/sys-available/toolchain-mips64eln64

@@ -0,0 +1,12 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64ELN64
+	bool "Toolchain only (mips64 little endian n64 ABI)"
+	select ADK_mips
+	select ADK_little
+	select ADK_n64
+	select ADK_toolchain_mips64el
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
+	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
+	help
+	  MIPS64 little endian n64 ABI toolchain.

target/mips/sys-available/toolchain-mips64n32

@@ -0,0 +1,12 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64N32
+	bool "Toolchain only (mips64 big endian n32 ABI)"
+	select ADK_mips
+	select ADK_big
+	select ADK_n32
+	select ADK_toolchain_mips64
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
+	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
+	help
+	  MIPS64 big endian n64 ABI toolchain.

target/mips/sys-available/toolchain-mips64n64

@@ -0,0 +1,12 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64N64
+	bool "Toolchain only (mips64 big endian n64 ABI)"
+	select ADK_mips
+	select ADK_big
+	select ADK_n64
+	select ADK_toolchain_mips64
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
+	select ADK_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TGZ
+	help
+	  MIPS64 big endian n64 ABI toolchain.

toolchain/gcc/Makefile

@@ -136,6 +136,8 @@ ifeq ($(ADK_LINUX_SH),y)
 endif
 	sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' $(WRKBUILD)/gcc/configure
 	cd $(GCC_BUILD_DIR_MINIMAL); PATH='$(TARGET_PATH)' \
+		CFLAGS="-O0 -g0" \
+		CXXFLAGS="-O0 -g0" \
 		$(WRKBUILD)/configure \
 			${GCC_CONFOPTS} \
 			--enable-languages=c \
@@ -154,6 +156,8 @@ $(WRKBUILD)/.headers: $(GCC_BUILD_DIR_MINIMAL)/.compiled
 $(GCC_BUILD_DIR_INITIAL)/.configured:
 	mkdir -p $(GCC_BUILD_DIR_INITIAL)
 	cd $(GCC_BUILD_DIR_INITIAL); PATH='$(TARGET_PATH)' \
+		CFLAGS="-O0 -g0" \
+		CXXFLAGS="-O0 -g0" \
 		$(WRKBUILD)/configure \
 			${GCC_CONFOPTS} \
 			--enable-languages=c \

toolchain/musl/patches/xxx-hotfix-sh.patch

@@ -0,0 +1,80 @@
+* thx to nsz from #musl
+diff -Nur musl-git/arch/sh/bits/user.h musl-sh/arch/sh/bits/user.h
+--- musl-git/arch/sh/bits/user.h	1970-01-01 01:00:00.000000000 +0100
++++ musl-sh/arch/sh/bits/user.h	2014-03-07 15:08:42.000000000 +0100
+@@ -0,0 +1,75 @@
++#undef __WORDSIZE
++#define __WORDSIZE 32
++
++#define REG_REG0	 0
++#define REG_REG15	15
++#define REG_PC		16
++#define REG_PR		17
++#define REG_SR		18
++#define REG_GBR		19
++#define REG_MACH	20
++#define REG_MACL	21
++#define REG_SYSCALL	22
++#define REG_FPREG0	23
++#define REG_FPREG15	38
++#define REG_XFREG0	39
++#define REG_XFREG15	54
++#define REG_FPSCR	55
++#define REG_FPUL	56
++
++struct pt_regs {
++	unsigned long regs[16];
++	unsigned long pc;
++	unsigned long pr;
++	unsigned long sr;
++	unsigned long gbr;
++	unsigned long mach;
++	unsigned long macl;
++	long tra;
++};
++
++struct pt_dspregs {
++	unsigned long a1;
++	unsigned long a0g;
++	unsigned long a1g;
++	unsigned long m0;
++	unsigned long m1;
++	unsigned long a0;
++	unsigned long x0;
++	unsigned long x1;
++	unsigned long y0;
++	unsigned long y1;
++	unsigned long dsr;
++	unsigned long rs;
++	unsigned long re;
++	unsigned long mod;
++};
++
++struct user_fpu_struct {
++	unsigned long fp_regs[16];
++	unsigned long xfp_regs[16];
++	unsigned long fpscr;
++	unsigned long fpul;
++};
++
++#define ELF_NGREG 23
++typedef unsigned long elf_greg_t;
++typedef elf_greg_t elf_gregset_t[ELF_NGREG];
++typedef struct user_fpu_struct elf_fpregset_t;
++
++struct user {
++	struct pt_regs regs;
++	struct user_fpu_struct fpu;
++	int u_fpvalid;
++	unsigned long u_tsize;
++	unsigned long u_dsize;
++	unsigned long u_ssize;
++	unsigned long start_code;
++	unsigned long start_data;
++	unsigned long start_stack;
++	long int signal;
++	unsigned long u_ar0;
++	struct user_fpu_struct *u_fpstate;
++	unsigned long magic;
++	char u_comm[32];
++};

toolchain/uClibc/Makefile

@@ -36,17 +36,17 @@ else
 	$(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS32\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS64\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_TARGET_ABI_N64),y)
+ifeq ($(ADK_n64),y)
 	$(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_TARGET_ABI_N32),y)
+ifeq ($(ADK_n32),y)
 	$(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_TARGET_ABI_O32),y)
+ifeq ($(ADK_o32),y)
 	$(SED) 's/.*\(CONFIG_MIPS_O32_ABI\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_N32_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config

tools/m4/Makefile

@@ -7,7 +7,7 @@ PKG_NAME:=		m4
 PKG_VERSION:=		1.4.17
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a5e9954b1dae036762f7b13673a2cf76
-PKG_SITES:=		http://www.gnu.org/software/m4/
+PKG_SITES:=		${MASTER_SITE_GNU:=m4/}
 
 include ../rules.mk
 

tools/mksh/Makefile

@@ -17,8 +17,8 @@ include ../rules.mk
 install: ${STAGING_HOST_DIR}/usr/bin/mksh
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
-	cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' \
+	cd ${WRKBUILD} && CC='${CC_FOR_BUILD}' CFLAGS='${CFLAGS_FOR_BUILD}' \
-	    CPPFLAGS='${TARGET_CPPFLAGS}' LDFLAGS='${TARGET_LDFLAGS}' \
+	    CPPFLAGS='${CPPFLAGS_FOR_BUILD}' LDFLAGS='${LDFLAGS_FOR_BUILD}' \
 	    HAVE_CAN_FSTACKPROTECTORALL=0 \
 	    TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -c lto
 	touch $@