diff -urN uClibc-0.9.19/Makefile uClibc-0.9.19-patch/Makefile --- uClibc-0.9.19/Makefile Mon Mar 3 07:47:56 2003 +++ uClibc-0.9.19-patch/Makefile Tue Mar 4 17:23:57 2003 @@ -145,6 +145,8 @@ ln -fs $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH) include/asm; \ fi; \ fi; + rm -f include/asm-generic; + ln -fs $(KERNEL_SOURCE)/include/asm-generic include/asm-generic; @if [ ! -f include/asm/unistd.h ] ; then \ set -e; \ echo " "; \ diff -urN uClibc-0.9.19/extra/gcc-uClibc/Makefile uClibc-0.9.19-patch/extra/gcc-uClibc/Makefile --- uClibc-0.9.19/extra/gcc-uClibc/Makefile Wed Dec 4 23:40:16 2002 +++ uClibc-0.9.19-patch/extra/gcc-uClibc/Makefile Tue Mar 4 17:24:26 2003 @@ -24,6 +24,11 @@ @echo "#define TARGET_ARCH " \"$(TARGET_ARCH)\" >> gcc-uClibc.h @echo "#define DYNAMIC_LINKER " \"$(DYNAMIC_LINKER)\" >> gcc-uClibc.h @echo "#define BUILD_DYNAMIC_LINKER " \"$(UCLIBC_DIR)/lib/$(UCLIBC_LDSO)\" >> gcc-uClibc.h +ifeq ($(strip $(HAVE_SHARED)),y) + @echo "#define __UCLIBC_HAS_SHARED__ 1" >> gcc-uClibc.h +else + @echo "#undef __UCLIBC_HAS_SHARED__" >> gcc-uClibc.h +endif ifeq ($(strip $(UCLIBC_HAS_MMU)),y) @echo "#define __UCLIBC_HAS_MMU__ 1" >> gcc-uClibc.h else diff -urN uClibc-0.9.19/extra/gcc-uClibc/gcc-uClibc.c uClibc-0.9.19-patch/extra/gcc-uClibc/gcc-uClibc.c --- uClibc-0.9.19/extra/gcc-uClibc/gcc-uClibc.c Thu Feb 27 04:59:33 2003 +++ uClibc-0.9.19-patch/extra/gcc-uClibc/gcc-uClibc.c Tue Mar 4 17:29:37 2003 @@ -134,7 +134,7 @@ char *devprefix; char *builddir; char *libstr; - char *build_dlstr; + char *build_dlstr = 0; char *ep; char *rpath_link[2]; char *rpath[2]; @@ -212,11 +212,13 @@ xstrcat(&(our_lib_path[0]), "-L", devprefix, "/lib", NULL); xstrcat(&(our_lib_path[1]), "-L", builddir, "/lib", NULL); +#ifdef __UCLIBC_HAS_SHARED__ build_dlstr = "-Wl,--dynamic-linker," BUILD_DYNAMIC_LINKER; dlstr = getenv("UCLIBC_GCC_DLOPT"); if (!dlstr) { dlstr = "-Wl,--dynamic-linker," DYNAMIC_LINKER; } +#endif ep = getenv("UCLIBC_GCC"); if (!ep) {