From e899e09565bf3415d18d3412946e0d3fb21a2c3a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Fri, 9 Sep 2016 20:50:52 +0200
Subject: fix microblaze development task

---
 package/glibc/Makefile                   | 17 +++++++++++++++--
 package/glibc/files/libc.so.microblaze   |  5 -----
 package/glibc/files/libc.so.microblazebe |  5 +++++
 package/glibc/files/libc.so.microblazeel |  5 +++++
 4 files changed, 25 insertions(+), 7 deletions(-)
 delete mode 100644 package/glibc/files/libc.so.microblaze
 create mode 100644 package/glibc/files/libc.so.microblazebe
 create mode 100644 package/glibc/files/libc.so.microblazeel

(limited to 'package/glibc')

diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 815152a72..18c71438a 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -24,6 +24,20 @@ $(eval $(call PKG_template,GLIBC_DEV,glibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${P
 $(eval $(call PKG_template,GLIBC_GCONV,glibc-gconv,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_GLIBC_GCONV},${PKGSD_GLIBC_GCONV},${PKG_SECTION},${PKG_OPTS}))
 
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
+GLIBC_ENV:=             PATH='${TARGET_PATH}' \
+                        BUILD_CC=${CC_FOR_BUILD} \
+                        CFLAGS="$(TARGET_CFLAGS)" \
+                        CXXFLAGS="$(TARGET_CXXFLAGS)" \
+                        CC="${TARGET_CC}" \
+                        CXX="${TARGET_CXX}" \
+                        AR="${TARGET_AR}" \
+                        RANLIB="${TARGET_RANLIB}" \
+			GCC_HONOUR_COPTS=s \
+                        libc_cv_forced_unwind=yes \
+			libc_cv_cc_with_libunwind=yes \
+                        libc_cv_c_cleanup=yes \
+                        libc_cv_gnu99_inline=yes \
+			libc_cv_initfini_array=yes
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
@@ -97,13 +111,12 @@ endif
 		headers_install
 	(cd $(WRKBUILD); \
 		$(GLIBC_ENV) \
-		GCC_HONOUR_COPTS=s \
 		$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/configure \
 			--prefix=$(IDIR_GLIBC_DEV)/usr \
 			--with-sysroot=$(IDIR_GLIBC_DEV) \
 			${GLIBC_CONFOPTS} \
 	);
-	$(GLIBC_ENV) $(MAKE) -C $(WRKBUILD) cross-compiling=yes install-headers
+	$(GLIBC_ENV) $(MAKE) -C $(WRKBUILD) GCC_HONOUR_COPTS=s cross-compiling=yes install-headers
 	touch $(IDIR_GLIBC_DEV)/usr/include/gnu/stubs.h
 	touch $(IDIR_GLIBC_DEV)/usr/include/gnu/stubs-{32,x32,64}.h
 	touch $(IDIR_GLIBC_DEV)/usr/include/bits/stdio_lim.h
diff --git a/package/glibc/files/libc.so.microblaze b/package/glibc/files/libc.so.microblaze
deleted file mode 100644
index 4642dcbd5..000000000
--- a/package/glibc/files/libc.so.microblaze
+++ /dev/null
@@ -1,5 +0,0 @@
-/* GNU ld script
-   Use the shared library, but some functions are only in
-   the static library, so try that secondarily.  */
-OUTPUT_FORMAT(elf32-microblaze)
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )
diff --git a/package/glibc/files/libc.so.microblazebe b/package/glibc/files/libc.so.microblazebe
new file mode 100644
index 000000000..4642dcbd5
--- /dev/null
+++ b/package/glibc/files/libc.so.microblazebe
@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-microblaze)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )
diff --git a/package/glibc/files/libc.so.microblazeel b/package/glibc/files/libc.so.microblazeel
new file mode 100644
index 000000000..4642dcbd5
--- /dev/null
+++ b/package/glibc/files/libc.so.microblazeel
@@ -0,0 +1,5 @@
+/* GNU ld script
+   Use the shared library, but some functions are only in
+   the static library, so try that secondarily.  */
+OUTPUT_FORMAT(elf32-microblaze)
+GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )
-- 
cgit v1.2.3