qi-hardware/xburst-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/xburst-tools.git synced 2024-11-26 17:41:34 +02:00
Code

-this patch is for the gcc-4.3

Browse Source 
-now the glibc can make sucess. still cann't make install
This commit is contained in:
xiangfu 2009-04-06 07:31:48 +00:00
parent 343ddddc8b
commit 75c9bd2885
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@ -32,8 +32,8 @@ KERNEL_PATH=kernel
TOOLCHAIN_PATH=toolchain TOOLCHAIN_PATH=toolchain
DL_PATH=$(TOOLCHAIN_PATH)/dl DL_PATH=$(TOOLCHAIN_PATH)/dl
INSTALL_PATH=install INSTALL_PATH=install
PATCHES_PATH=$(TOOLCHAIN_PATH)/patches PATCHES_PATH=
GLIBC_PATCHES_PATH=$(PATCHES_PATH)/glibc GLIBC_PATCHES_PATH=$(TOOLCHAIN_PATH)/patches/glibc
BINUTILS_PACKAGE=$(BINUTILS_VER).tar.bz2 BINUTILS_PACKAGE=$(BINUTILS_VER).tar.bz2
BINUTILS_URL= \ BINUTILS_URL= \
@ -105,11 +105,12 @@ glibc: $(DL_PATH)/$(GLIBC_PACKAGE) $(DL_PATH)/$(GLIBC_PORTS_PACKAGE) $(DL_PATH)/
patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-cross_hacks-1.patch && \ patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-cross_hacks-1.patch && \
patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-libgcc_eh-1.patch && \ patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-libgcc_eh-1.patch && \
patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-localedef_segfault-1.patch && \ patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-localedef_segfault-1.patch && \
patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-mawk_fix-1.patch patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-mawk_fix-1.patch && \
# patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-alpha_ioperm_fix-1.patch && \ patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-alpha_ioperm_fix-1.patch && \
# patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch && \ patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch && \
# patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-sysdep_cancel-1.patch && \ patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-sysdep_cancel-1.patch && \
# patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-hppa_nptl-1.patch patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-hppa_nptl-1.patch && \
patch -Np1 -i $(PWD)/$(GLIBC_PATCHES_PATH)/glibc-2.6.1-for_gcc-4.3.patch
mkdir -p $(TOOLCHAIN_PATH)/$(GLIBC_VER)/build mkdir -p $(TOOLCHAIN_PATH)/$(GLIBC_VER)/build
cd $(TOOLCHAIN_PATH)/$(GLIBC_VER)/build && \ cd $(TOOLCHAIN_PATH)/$(GLIBC_VER)/build && \
echo "libc_cv_forced_unwind=yes" > config.cache && \ echo "libc_cv_forced_unwind=yes" > config.cache && \
@ -124,8 +125,8 @@ glibc: $(DL_PATH)/$(GLIBC_PACKAGE) $(DL_PATH)/$(GLIBC_PORTS_PACKAGE) $(DL_PATH)/
--with-headers=$(PWD)/$(TOOLCHAIN_PATH)/$(KERNEL_HEADERS_VER) \ --with-headers=$(PWD)/$(TOOLCHAIN_PATH)/$(KERNEL_HEADERS_VER) \
--cache-file=config.cache && \ --cache-file=config.cache && \
make CFLAGS=$(CFLAGS) && \ make CFLAGS=$(CFLAGS) && \
mkdir -p $(TOOLCHAIN_PATH)/$(GLIBC_VER)/glibc-install && \ mkdir -p $(PWD)$(TOOLCHAIN_PATH)/$(GLIBC_VER)/glibc-install && \
make install_root=$(TOOLCHAIN_PATH)/$(GLIBC_VER)/glibc-install install make install_root=$(PWD)/$(TOOLCHAIN_PATH)/$(GLIBC_VER)/glibc-install install
touch $@ touch $@

24
toolchain/patches/glibc/glibc-2.6.1-for_gcc-4.3.patch Normal file
View File

@ -0,0 +1,24 @@
diff -Naur glibc-2.6.1/locale/programs/charmap-kw.h glibc-2.6.1.m/locale/programs/charmap-kw.h
--- glibc-2.6.1/locale/programs/charmap-kw.h 2005-12-20 15:10:31.000000000 +0800
+++ glibc-2.6.1.m/locale/programs/charmap-kw.h 2009-04-06 14:59:23.000000000 +0800
@@ -127,7 +127,7 @@
#ifdef __GNUC__
__inline
#endif
-const struct keyword_t *
+static const struct keyword_t *
charmap_hash (register const char *str, register unsigned int len)
{
static const struct keyword_t wordlist[] =
diff -Naur glibc-2.6.1/locale/programs/locfile-kw.h glibc-2.6.1.m/locale/programs/locfile-kw.h
--- glibc-2.6.1/locale/programs/locfile-kw.h 2005-12-20 15:10:31.000000000 +0800
+++ glibc-2.6.1.m/locale/programs/locfile-kw.h 2009-04-06 14:59:47.000000000 +0800
@@ -127,7 +127,7 @@
#ifdef __GNUC__
__inline
#endif
-const struct keyword_t *
+static const struct keyword_t *
locfile_hash (register const char *str, register unsigned int len)
{
static const struct keyword_t wordlist[] =