Browse Source

or1k: add glibc support

Waldemar Brodkorb 8 years ago
parent
commit
dc7438a5fe
3 changed files with 18 additions and 5 deletions
  1. 1 0
      target/config/Config.in.cpu
  2. 12 5
      target/config/Config.in.libc
  3. 5 0
      toolchain/glibc/Makefile.inc

+ 1 - 0
target/config/Config.in.cpu

@@ -881,6 +881,7 @@ config ADK_CPU_OR1K
 	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
 	select ADK_TARGET_WITHOUT_CXX if ADK_TARGET_LIB_UCLIBC_NG
 	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_MUSL
+	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
 	select ADK_TARGET_WITH_MMU
 
 config ADK_CPU_PARISC

+ 12 - 5
target/config/Config.in.libc

@@ -39,7 +39,6 @@ config ADK_TARGET_LIB_GLIBC
 	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_ARCH_OR1K
 	depends on !ADK_TARGET_ARCH_XTENSA
 	depends on !ADK_TARGET_UCLINUX
 	depends on !ADK_TARGET_WITHOUT_MMU
@@ -89,19 +88,26 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT
 
 config ADK_TARGET_LIB_GLIBC_2_22
 	bool "2.22"
-	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA
+	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA \
+					&& !ADK_TARGET_ARCH_OR1K
 
 config ADK_TARGET_LIB_GLIBC_2_21
 	bool "2.21"
-	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA
+	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA \
+					&& !ADK_TARGET_ARCH_OR1K
 
 config ADK_TARGET_LIB_GLIBC_2_20
 	bool "2.20"
-	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA
+	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA \
+					&& !ADK_TARGET_ARCH_OR1K
+
+config ADK_TARGET_LIB_GLIBC_OR1K
+	bool "2.20-or1k"
+	depends on ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_OR1K
 
 config ADK_TARGET_LIB_GLIBC_GIT
 	bool "git"
-	depends on ADK_TARGET_LIB_GLIBC
+	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_OR1K
 
 config ADK_TARGET_LIB_MUSL_1_1_12
 	bool "1.1.12"
@@ -171,6 +177,7 @@ config ADK_LIBC_VERSION
 	default "2.22" if ADK_TARGET_LIB_GLIBC_2_22
 	default "2.21" if ADK_TARGET_LIB_GLIBC_2_21
 	default "2.20" if ADK_TARGET_LIB_GLIBC_2_20
+	default "2.20-or1k" if ADK_TARGET_LIB_GLIBC_OR1K
 	default "2.2.0" if ADK_TARGET_LIB_NEWLIB_2_2_0
 	default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
 		         ADK_TARGET_LIB_MUSL_GIT || \

+ 5 - 0
toolchain/glibc/Makefile.inc

@@ -31,4 +31,9 @@ PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
 PKG_RELEASE:=		1
 PKG_HASH:=		2d3997f588401ea095a0b27227b1d50cdfdd416236f6567b564549d3b46ea2a2
 endif
+ifeq ($(ADK_TARGET_LIB_GLIBC_OR1K),y)
+PKG_VERSION:=		2.19.90
+PKG_SITES:=		https://github.com/bluecmd/or1k-glibc.git
+PKG_RELEASE:=		1
+endif
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz