summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-09-09 20:50:52 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-09-09 20:50:52 +0200
commite899e09565bf3415d18d3412946e0d3fb21a2c3a (patch)
treec95e0bb5010f5207a4b41f213dc94dbb2b489e1f
parent20df90e5baf35a1e2d248f815cb74838726b206e (diff)
fix microblaze development task
-rw-r--r--package/glibc/Makefile17
-rw-r--r--package/glibc/files/libc.so.microblazebe (renamed from package/glibc/files/libc.so.microblaze)0
-rw-r--r--package/glibc/files/libc.so.microblazeel5
-rw-r--r--tasks/004-development1
4 files changed, 20 insertions, 3 deletions
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.microblazebe
index 4642dcbd5..4642dcbd5 100644
--- a/package/glibc/files/libc.so.microblaze
+++ b/package/glibc/files/libc.so.microblazebe
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 ) )
diff --git a/tasks/004-development b/tasks/004-development
index e7d22d73a..d486a97e8 100644
--- a/tasks/004-development
+++ b/tasks/004-development
@@ -5,7 +5,6 @@ config ADK_APPLIANCE_DEVELOPMENT
select ADK_PACKAGE_GXX
select ADK_PACKAGE_BINUTILS
select ADK_PACKAGE_MAKE
- select ADK_PACKAGE_GDB
select ADK_PACKAGE_BISON
select ADK_PACKAGE_FLEX
select ADK_PACKAGE_PKGCONF