--- initrd/busybox-1.01/libbb/loop.c.toolchain 2004-08-16 10:36:28.000000000 +0200
+++ initrd/busybox-1.01/libbb/loop.c 2005-08-30 19:25:40.000000000 +0200
@@ -32,6 +32,9 @@
#include <linux/version.h>
#include <asm/posix_types.h>
+/* (sb) for some reason, even the above include doesn't pick this up */
+typedef unsigned short __kernel_old_dev_t;
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
#define __bb_kernel_dev_t __kernel_old_dev_t
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
--- initrd/busybox-1.01/Rules.mak.toolchain 2004-08-16 12:23:33.000000000 +0200
+++ initrd/busybox-1.01/Rules.mak 2005-08-30 19:25:40.000000000 +0200
@@ -35,6 +35,7 @@
# by asking the CC compiler what arch it compiles things for, so unless
# your compiler is broken, you should not need to specify TARGET_ARCH
CROSS =$(subst ",, $(strip $(CROSS_COMPILER_PREFIX)))
+CROSS =../uClibc/bin/i386-uclibc-
CC = $(CROSS)gcc
AR = $(CROSS)ar
AS = $(CROSS)as
@@ -59,6 +60,7 @@
# especially from the command line, use this instead of CFLAGS directly.
# For optimization overrides, it's better still to set OPTIMIZATION.
CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS)))
+CFLAGS_EXTRA= -I../uClibc/include
# If you have a "pristine" source directory, point BB_SRC_DIR to it.
# Experimental and incomplete; tell the mailing list
--- initrd/uClibc-0.9.28/extra/gcc-uClibc/Makefile.toolchain 2005-08-30 19:25:40.000000000 +0200
+++ initrd/uClibc-0.9.28/extra/gcc-uClibc/Makefile 2005-08-30 19:25:40.000000000 +0200
@@ -0,0 +1,90 @@
+# Makefile for building a fake gcc/binutils toolchain
+# that simply spoofs the location of the C library
+#
+# Copyright (C) 2000-2002 Erik Andersen <andersen@uclibc.org>
+#
+
+TOPDIR = ../../
+include $(TOPDIR)Rules.mak
+
+UCLIBC_DIR = $(shell (cd ../.. ; /bin/pwd))
+GCC_BIN = $(shell which $(CC))
+LD_BIN = $(shell which $(LD))
+GCCINCDIR:= ${shell $(CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"}
+
+all: gcc-uClibc ld-uClibc
+
+gcc-uClibc.h: Makefile $(TOPDIR)/.config
+ @echo "/* this file was autogenerated by make */" > gcc-uClibc.h
+ @echo "#define UCLIBC_TARGET_PREFIX " \"$(TARGET_PREFIX)\" >> gcc-uClibc.h
+ @echo "#define UCLIBC_DEVEL_PREFIX " \"$(DEVEL_PREFIX)\" >> gcc-uClibc.h
+ @echo "#define UCLIBC_BUILD_DIR " \"$(UCLIBC_DIR)\" >> gcc-uClibc.h
+ @echo "#define GCC_BIN " \"$(GCC_BIN)\" >> gcc-uClibc.h
+ @echo "#define LIBGCC_DIR " \"$(LIBGCC_DIR)\" >> gcc-uClibc.h
+ @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
+ @echo "#undef __UCLIBC_HAS_MMU__" >> gcc-uClibc.h
+endif
+ifeq ($(strip $(HAS_ELF)),y)
+ @echo "#define __HAS_ELF__ 1" >> gcc-uClibc.h
+else
+ @echo "#undef __HAS_ELF__" >> gcc-uClibc.h
+endif
+ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
+ @echo "#define __UCLIBC_CTOR_DTOR__ 1" >> gcc-uClibc.h
+ifeq ($(strip $(UCLIBC_PROFILING)),y)
+ @echo "#define __UCLIBC_PROFILING__ 1" >> gcc-uClibc.h
+else
+ @echo "#undef __UCLIBC_PROFILING__" >> gcc-uClibc.h
+endif
+else
+ @echo "#undef __UCLIBC_CTOR_DTOR__" >> gcc-uClibc.h
+endif
+
+gcc-uClibc: gcc-uClibc.h gcc-uClibc.c
+ $(HOSTCC) $(HOSTCFLAGS) -s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc
+
+ld-uClibc:
+ @echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld
+ @echo "# This file was autogenerated by make" >> $(TARGET_ARCH)-uclibc-ld
+ @echo "$(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/usr/lib -L$(DEVEL_PREFIX)/lib "\
+ "-L$(UCLIBC_DIR)" >> $(TARGET_ARCH)-uclibc-ld
+ chmod a+x $(TARGET_ARCH)-uclibc-ld
+
+install: all
+ install -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin;
+ install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin;
+ install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/
+ install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/
+ ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc
+ ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/gcc
+ ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/cc
+ ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ld
+ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
+ ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-g++
+ ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-c++
+ ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/c++
+ ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/g++
+endif
+ for app in addr2line ar as cpp gasp nm objcopy \
+ objdump ranlib size strings strip; do \
+ APPNAME=`which $(CROSS)$${app}`; \
+ if [ -x "$$APPNAME" ] ; then \
+ ln -fs "$$APPNAME" $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/$${app}; \
+ ln -fs "$$APPNAME" $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \
+ fi; \
+ done
+
+clean:
+ rm -f gcc-uClibc.h *-uclibc-gcc *-uclibc-ld core
+
+
--- initrd/uClibc-0.9.28/extra/gcc-uClibc/gcc-uClibc.c.toolchain 2005-08-30 19:25:40.000000000 +0200
+++ initrd/uClibc-0.9.28/extra/gcc-uClibc/gcc-uClibc.c 2005-08-30 19:25:40.000000000 +0200
@@ -0,0 +1,660 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2000 Manuel Novoa III
+ * Copyright (C) 2002-2003 Erik Andersen
+ *
+ * This is a crude wrapper to use uClibc with gcc.
+ * It was originally written to work around ./configure for ext2fs-utils.
+ * It certainly can be improved, but it works for me in the normal cases.
+ *
+ * April 7, 2001
+ *
+ * A bug was fixed in building the gcc command line when dynamic linking.
+ * The functions dlopen, etc. now work. At this time, you must make sure
+ * the correct libdl.so is included however. It is safest to, for example,
+ * add /lib/libdl.so.1 if using ld-linux.so.1 rather than adding -ldl to the
+ * command line.
+ *
+ * Note: This is only a problem if devel and target archs are the same. To
+ * avoid the problem, you can use a customized dynamic linker.
+ *
+ *
+ * April 18, 2001
+ *
+ * The wrapper now works with either installed and uninstalled uClibc versions.
+ * If you want to use the uninstalled header files and libs, either include
+ * the string "build" in the invocation name such as
+ * 'ln -s <ARCH>-uclibc-gcc <ARCH>-uclibc-gcc-build'
+ * or include it in the environment variable setting of UCLIBC_ENV.
+ * Note: This automatically enables the "rpath" behavior described below.
+ *
+ * The wrapper will now pass the location of the uClibc shared libs used to
+ * the linker with the "-rpath" option if the invocation name includes the
+ * string "rpath" or if the environment variable UCLIBC_ENV include it (as
+ * with "build" above). This is primarily intended to be used on devel
+ * platforms of the same arch as the target. A good place to use this feature
+ * would be in the uClibc/test directory.
+ *
+ * The wrapper now displays the command line passed to gcc when '-v' is used.
+ *
+ * May 31, 2001
+ *
+ * "rpath" and "build" behavior are now decoupled. You can of course get
+ * the old "build" behavior by setting UCLIBC_ENV="rpath-build". Order
+ * isn't important here, as only the substrings are searched for.
+ *
+ * Added environment variable check for UCLIBC_GCC_DLOPT to let user specify
+ * an alternative dynamic linker at runtime without using command line args.
+ * Since this wouldn't commonly be used, I made it easy on myself. You have
+ * to match the option you would have passed to the gcc wrapper. As an
+ * example,
+ *
+ * export UCLIBC_GCC_DLOPT="-Wl,--dynamic-linker,/lib/ld-alt-linker.so.3"
+ *
+ * This is really only useful if target arch == devel arch and DEVEL_PREFIX
+ * isn't empty. It involves a recompile, but you can at least test apps
+ * on your devel system if combined with the "rpath" behavor if by using
+ * LD_LIBRARY_PATH, etc.
+ *
+ * Also added check for "-Wl,--dynamic-linker" on the command line. The
+ * use default dynamic linker or the envirnment-specified dynamic linker
+ * is disabled in that case.
+ *
+ * Added options --uclibc-use-build-dir and --uclibc-use-rpath so that those
+ * behaviors can be invoked from the command line.
+ *
+ */
+
+/*
+ *
+ * TODO:
+ * Check/modify gcc-specific environment variables?
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include "gcc-uClibc.h"
+
+static char *our_usr_lib_path = "-L"UCLIBC_DEVEL_PREFIX"/lib";
+
+static char static_linking[] = "-static";
+static char nostdinc[] = "-nostdinc";
+static char nostartfiles[] = "-nostartfiles";
+static char nodefaultlibs[] = "-nodefaultlibs";
+static char nostdlib[] = "-nostdlib";
+#ifdef __UCLIBC_CTOR_DTOR__
+static char nostdinc_plus[] = "-nostdinc++";
+#endif
+
+/* Include a local implementation of basename, since this
+ * uses the host system's C lib, and CYGWIN apparently
+ * doesn't provide an implementation of basename(). */
+char *basename(const char *path)
+{
+ register const char *s;
+ register const char *p;
+ p = s = path;
+ while (*s) {
+ if (*s++ == '/') {
+ p = s;
+ }
+ }
+ return (char *) p;
+}
+
+char *dirname(char *path)
+{
+ static const char null_or_empty_or_noslash[] = ".";
+ register char *s;
+ register char *last;
+ char *first;
+
+ last = s = path;
+
+ if (s != NULL) {
+
+LOOP:
+ while (*s && (*s != '/')) ++s;
+ first = s;
+ while (*s == '/') ++s;
+ if (*s) {
+ last = first;
+ goto LOOP;
+ }
+
+ if (last == path) {
+ if (*last != '/') {
+ goto DOT;
+ }
+ if ((*++last == '/') && (last[1] == 0)) {
+ ++last;
+ }
+ }
+ *last = 0;
+ return path;
+ }
+DOT:
+ return (char *) null_or_empty_or_noslash;
+}
+
+
+extern void *xmalloc(size_t size)
+{
+ void *ptr = malloc(size);
+
+ if (!ptr) {
+ fprintf(stderr, "memory exhausted");
+ exit(EXIT_FAILURE);
+ }
+ return ptr;
+}
+
+void xstrcat(char **string, ...)
+{
+ const char *c;
+ va_list p;
+ /* Don't bother to calculate how big exerything
+ * will be, just be careful to not overflow... */
+ va_start(p, string);
+ *string = xmalloc(BUFSIZ);
+ **string = '\0';
+ while(1) {
+ if (!(c = va_arg(p, const char *)))
+ break;
+ strcat(*string, c);
+ }
+ va_end(p);
+}
+
+int main(int argc, char **argv)
+{
+ int use_build_dir = 0, linking = 1, use_static_linking = 0;
+ int use_stdinc = 1, use_start = 1, use_stdlib = 1, use_pic = 0;
+ int source_count = 0, use_rpath = 0, verbose = 0;
+ int i, j, k, l, m, n;
+ char ** gcc_argv;
+ char ** gcc_argument;
+ char ** libraries;
+ char ** libpath;
+ char *dlstr;
+ char *incstr;
+ char *devprefix;
+ char *builddir;
+ char *libstr;
+ char *build_dlstr = 0;
+ char *cc;
+ char *ep;
+ char *rpath_link[2];
+ char *rpath[2];
+ char *uClibc_inc[2];
+ char *our_lib_path[2];
+ char *crt0_path[2];
+ char *crtbegin_path[2];
+ char *crtend_path[2];
+ const char *application_name;
+#ifdef __UCLIBC_CTOR_DTOR__
+ char *crti_path[2];
+ char *crtn_path[2];
+ int len;
+ int ctor_dtor = 1, cplusplus = 0, use_nostdinc_plus = 0;
+ int findlibgcc = 1;
+ char *cpp = NULL;
+#endif
+#ifdef __UCLIBC_PROFILING__
+ int profile = 0;
+ char *gcrt1_path[2];
+#endif
+
+ cc = getenv("UCLIBC_CC");
+ if (cc==NULL) {
+ cc = GCC_BIN;
+#ifdef __UCLIBC_CTOR_DTOR__
+ findlibgcc = 0;
+#endif
+ }
+
+ application_name = basename(argv[0]);
+ if (application_name[0] == '-')
+ application_name++;
+
+#ifdef __UCLIBC_CTOR_DTOR__
+ /* We must use strstr since g++ might be named like a
+ * cross compiler (i.e. arm-linux-g++). We must also
+ * search carefully, in case we are searching something
+ * like /opt/c++/gcc-3.1/bin/arm-linux-g++ or some similar
+ * perversion... */
+ len = strlen(application_name);
+ if ((strcmp(application_name+len-3, "g++")==0) ||
+ (strcmp(application_name+len-3, "c++")==0)) {
+ len = strlen(cc);
+ if (strcmp(cc+len-3, "gcc")==0) {
+ cpp = strdup(cc);
+ cpp[len-1]='+';
+ cpp[len-2]='+';
+ }
+ cplusplus = 1;
+ use_nostdinc_plus = 1;
+ }
+#endif
+
+ devprefix = getenv("UCLIBC_DEVEL_PREFIX");
+ if (!devprefix) {
+ devprefix = UCLIBC_DEVEL_PREFIX;
+ }
+
+ builddir = getenv("UCLIBC_BUILD_DIR");
+ if (!builddir) {
+ builddir = UCLIBC_BUILD_DIR;
+ }
+
+ incstr = getenv("UCLIBC_GCC_INC");
+ libstr = getenv("UCLIBC_GCC_LIB");
+
+ ep = getenv("UCLIBC_ENV");
+ if (!ep) {
+ ep = "";
+ }
+
+ if (strstr(ep,"build") != 0) {
+ use_build_dir = 1;
+ }
+
+ if (strstr(ep,"rpath") != 0) {
+ use_rpath = 1;
+ }
+
+
+ xstrcat(&(rpath_link[0]), "-Wl,-rpath-link,", devprefix, "/lib", NULL);
+ xstrcat(&(rpath_link[1]), "-Wl,-rpath-link,", builddir, "/lib", NULL);
+
+ xstrcat(&(rpath[0]), "-Wl,-rpath,", devprefix, "/lib", NULL);
+ xstrcat(&(rpath[1]), "-Wl,-rpath,", builddir, "/lib", NULL);
+
+ xstrcat(&(uClibc_inc[0]), devprefix, "/include/", NULL);
+ xstrcat(&(uClibc_inc[1]), builddir, "/include/", NULL);
+
+#ifdef __UCLIBC_CTOR_DTOR__
+ xstrcat(&(crt0_path[0]), devprefix, "/lib/crt1.o", NULL);
+ xstrcat(&(crt0_path[1]), builddir, "/lib/crt1.o", NULL);
+ xstrcat(&(crti_path[0]), devprefix, "/lib/crti.o", NULL);
+ xstrcat(&(crti_path[1]), builddir, "/lib/crti.o", NULL);
+ xstrcat(&(crtn_path[0]), devprefix, "/lib/crtn.o", NULL);
+ xstrcat(&(crtn_path[1]), builddir, "/lib/crtn.o", NULL);
+#else
+ xstrcat(&(crt0_path[0]), devprefix, "/lib/crt0.o", NULL);
+ xstrcat(&(crt0_path[1]), builddir, "/lib/crt0.o", NULL);
+#endif
+#ifdef __UCLIBC_PROFILING__
+ xstrcat(&(gcrt1_path[0]), devprefix, "/lib/gcrt1.o", NULL);
+ xstrcat(&(gcrt1_path[1]), builddir, "/lib/gcrt1.o", NULL);
+#endif
+
+ 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
+
+ m = 0;
+ libraries = __builtin_alloca(sizeof(char*) * (argc));
+ libraries[m] = '\0';
+
+ n = 0;
+ libpath = __builtin_alloca(sizeof(char*) * (argc));
+ libpath[n] = '\0';
+
+ for ( i = 1 ; i < argc ; i++ ) {
+ if (argv[i][0] == '-') { /* option */
+ switch (argv[i][1]) {
+ case 'c': /* compile or assemble */
+ case 'S': /* generate assembler code */
+ case 'E': /* preprocess only */
+ case 'M': /* generate dependencies */
+ linking = 0;
+ break;
+ case 'L': /* library */
+ libpath[n++] = argv[i];
+ libpath[n] = '\0';
+ if (argv[i][2] == 0) {
+ argv[i] = '\0';
+ libpath[n++] = argv[++i];
+ libpath[n] = '\0';
+ }
+ argv[i] = '\0';
+ break;
+ case 'l': /* library */
+ libraries[m++] = argv[i];
+ libraries[m] = '\0';
+ argv[i] = '\0';
+ break;
+ case 'v': /* verbose */
+ if (argv[i][2] == 0) verbose = 1;
+ printf("Invoked as %s\n", argv[0]);
+ break;
+ case 'n':
+ if (strcmp(nostdinc,argv[i]) == 0) {
+ use_stdinc = 0;
+ } else if (strcmp(nostartfiles,argv[i]) == 0) {
+#ifdef __UCLIBC_CTOR_DTOR__
+ ctor_dtor = 0;
+#endif
+ use_start = 0;
+ } else if (strcmp(nodefaultlibs,argv[i]) == 0) {
+ use_stdlib = 0;
+ argv[i] = '\0';
+ } else if (strcmp(nostdlib,argv[i]) == 0) {
+#ifdef __UCLIBC_CTOR_DTOR__
+ ctor_dtor = 0;
+#endif
+ use_start = 0;
+ use_stdlib = 0;
+ }
+#ifdef __UCLIBC_CTOR_DTOR__
+ else if (strcmp(nostdinc_plus,argv[i]) == 0) {
+ if (cplusplus==1) {
+ use_nostdinc_plus = 0;
+ }
+ }
+#endif
+ break;
+ case 's':
+ if (strstr(argv[i],static_linking) != NULL) {
+ use_static_linking = 1;
+ }
+ if (strcmp("-shared",argv[i]) == 0) {
+ use_start = 0;
+ use_pic = 1;
+ }
+ break;
+ case 'W': /* -static could be passed directly to ld */
+ if (strncmp("-Wl,",argv[i],4) == 0) {
+ if (strstr(argv[i],static_linking) != 0) {
+ use_static_linking = 1;
+ }
+ if (strstr(argv[i],"--dynamic-linker") != 0) {
+ dlstr = 0;
+ }
+ }
+ break;
+#ifdef __UCLIBC_PROFILING__
+ case 'p':
+ if (strcmp("-pg",argv[i]) == 0) {
+ profile = 1;
+ }
+ break;
+#endif
+ case 'f':
+ /* Check if we are doing PIC */
+ if (strcmp("-fPIC",argv[i]) == 0) {
+ use_pic = 1;
+ } else if (strcmp("-fpic",argv[i]) == 0) {
+ use_pic = 1;
+ }
+#ifdef __UCLIBC_PROFILING__
+ else if (strcmp("-fprofile-arcs",argv[i]) == 0) {
+ profile = 1;
+ }
+#endif
+ break;
+
+ case '-':
+ if (strstr(argv[i]+1,static_linking) != NULL) {
+ use_static_linking = 1;
+ argv[i]='\0';
+ } else if (strcmp("--uclibc-use-build-dir",argv[i]) == 0) {
+ use_build_dir = 1;
+ argv[i]='\0';
+ } else if (strcmp("--uclibc-use-rpath",argv[i]) == 0) {
+ use_rpath = 1;
+ argv[i]='\0';
+ } else if (strcmp ("--uclibc-cc", argv[i]) == 0 && argv[i + 1]) {
+ cc = argv[i + 1];
+ argv[i] = 0;
+ argv[i + 1] = 0;
+ } else if (strncmp ("--uclibc-cc=", argv[i], 12) == 0) {
+ cc = argv[i] + 12;
+ argv[i] = 0;
+ }
+#ifdef __UCLIBC_CTOR_DTOR__
+ else if (strcmp("--uclibc-no-ctors",argv[i]) == 0) {
+ ctor_dtor = 0;
+ argv[i]='\0';
+ }
+#endif
+ break;
+ }
+ } else { /* assume it is an existing source file */
+ ++source_count;
+ }
+ }
+
+ gcc_argv = __builtin_alloca(sizeof(char*) * (argc + 64));
+ gcc_argument = __builtin_alloca(sizeof(char*) * (argc + 20));
+
+ i = 0; k = 0;
+#ifdef __UCLIBC_CTOR_DTOR__
+ if (ctor_dtor) {
+ struct stat statbuf;
+ if (findlibgcc==1 || stat(LIBGCC_DIR, &statbuf)!=0 ||
+ !S_ISDIR(statbuf.st_mode))
+ {
+ /* Bummer, gcc is hiding from us. This is going
+ * to really slow things down... bummer. */
+ int status, gcc_pipe[2];
+ pid_t pid, wpid;
+
+ pipe(gcc_pipe);
+ if (!(pid = fork())) {
+ char *argv[4];
+ close(gcc_pipe[0]);
+ close(1);
+ close(2);
+ dup2(gcc_pipe[1], 1);
+ dup2(gcc_pipe[1], 2);
+ argv[0] = cc;
+ argv[1] = "-print-libgcc-file-name";
+ argv[2] = NULL;
+ execvp(cc, argv);
+ close(gcc_pipe[1]);
+ _exit(EXIT_FAILURE);
+ }
+ wpid=0;
+ while (wpid != pid) {
+ wpid = wait(&status);
+ }
+ close(gcc_pipe[1]);
+ if (WIFEXITED(status) && WEXITSTATUS(status)) {
+crash_n_burn:
+ fprintf(stderr, "Unable to locale crtbegin.o provided by gcc");
+ exit(EXIT_FAILURE);
+ }
+ if (WIFSIGNALED(status)) {
+ fprintf(stderr, "%s exited because of uncaught signal %d", cc, WTERMSIG(status));
+ exit(EXIT_FAILURE);
+ }
+
+ {
+ char buf[1024], *dir;
+ status = read(gcc_pipe[0], buf, sizeof(buf));
+ close(gcc_pipe[0]);
+ if (status < 0) {
+ goto crash_n_burn;
+ }
+ dir = dirname(buf);
+ xstrcat(&(crtbegin_path[0]), dir, "/crtbegin.o", NULL);
+ xstrcat(&(crtbegin_path[1]), dir, "/crtbeginS.o", NULL);
+ xstrcat(&(crtend_path[0]), dir, "/crtend.o", NULL);
+ xstrcat(&(crtend_path[1]), dir, "/crtendS.o", NULL);
+ }
+
+ } else {
+ xstrcat(&(crtbegin_path[0]), LIBGCC_DIR, "crtbegin.o", NULL);
+ xstrcat(&(crtbegin_path[1]), LIBGCC_DIR, "crtbeginS.o", NULL);
+ xstrcat(&(crtend_path[0]), LIBGCC_DIR, "crtend.o", NULL);
+ xstrcat(&(crtend_path[1]), LIBGCC_DIR, "crtendS.o", NULL);
+ }
+ }
+
+ if (cplusplus && cpp)
+ gcc_argv[i++] = cpp;
+ else
+#endif
+ gcc_argv[i++] = cc;
+
+ for ( j = 1 ; j < argc ; j++ ) {
+ if (argv[j]=='\0') {
+ continue;
+ } else {
+ gcc_argument[k++] = argv[j];
+ gcc_argument[k] = '\0';
+ }
+ }
+
+ if (linking && source_count) {
+#if defined __HAVE_ELF__ && ! defined __UCLIBC_HAS_MMU__
+ gcc_argv[i++] = "-Wl,-elf2flt";
+#endif
+ gcc_argv[i++] = nostdlib;
+ if (use_static_linking) {
+ gcc_argv[i++] = static_linking;
+ }
+ if (!use_static_linking) {
+ if (dlstr && use_build_dir) {
+ gcc_argv[i++] = build_dlstr;
+ } else if (dlstr) {
+ gcc_argv[i++] = dlstr;
+ }
+ if (use_rpath) {
+ gcc_argv[i++] = rpath[use_build_dir];
+ }
+ }
+ for ( l = 0 ; l < n ; l++ ) {
+ if (libpath[l]) gcc_argv[i++] = libpath[l];
+ }
+ gcc_argv[i++] = rpath_link[use_build_dir]; /* just to be safe */
+ if( libstr )
+ gcc_argv[i++] = libstr;
+ gcc_argv[i++] = our_lib_path[use_build_dir];
+ if (!use_build_dir) {
+ gcc_argv[i++] = our_usr_lib_path;
+ }
+ }
+ if (use_stdinc && source_count) {
+ gcc_argv[i++] = nostdinc;
+#ifdef __UCLIBC_CTOR_DTOR__
+ if (cplusplus) {
+ char *cppinc;
+ if (use_nostdinc_plus) {
+ gcc_argv[i++] = nostdinc_plus;
+ }
+ xstrcat(&cppinc, uClibc_inc[use_build_dir], "g++/", NULL);
+ gcc_argv[i++] = "-isystem";
+ gcc_argv[i++] = cppinc;
+ xstrcat(&cppinc, uClibc_inc[use_build_dir], "g++-v3/", NULL);
+ gcc_argv[i++] = "-isystem";
+ gcc_argv[i++] = cppinc;
+ }
+#endif
+ gcc_argv[i++] = "-isystem";
+ gcc_argv[i++] = uClibc_inc[use_build_dir];
+ gcc_argv[i++] = "-iwithprefix";
+ gcc_argv[i++] = "include";
+ if( incstr )
+ gcc_argv[i++] = incstr;
+ }
+
+ if (linking && source_count) {
+
+#ifdef __UCLIBC_PROFILING__
+ if (profile) {
+ gcc_argv[i++] = gcrt1_path[use_build_dir];
+ }
+#endif
+#ifdef __UCLIBC_CTOR_DTOR__
+ if (ctor_dtor) {
+ gcc_argv[i++] = crti_path[use_build_dir];
+ if (use_pic) {
+ gcc_argv[i++] = crtbegin_path[1];
+ } else {
+ gcc_argv[i++] = crtbegin_path[0];
+ }
+ }
+#endif
+ if (use_start) {
+#ifdef __UCLIBC_PROFILING__
+ if (!profile)
+#endif
+ {
+ gcc_argv[i++] = crt0_path[use_build_dir];
+ }
+ }
+ for ( l = 0 ; l < k ; l++ ) {
+ if (gcc_argument[l]) gcc_argv[i++] = gcc_argument[l];
+ }
+ if (use_stdlib) {
+ //gcc_argv[i++] = "-Wl,--start-group";
+ gcc_argv[i++] = "-lgcc";
+ }
+ for ( l = 0 ; l < m ; l++ ) {
+ if (libraries[l]) gcc_argv[i++] = libraries[l];
+ }
+ if (use_stdlib) {
+#ifdef __UCLIBC_CTOR_DTOR__
+ if (cplusplus) {
+ gcc_argv[ i++ ] = "-lstdc++";
+ gcc_argv[ i++ ] = "-lm";
+ }
+#endif
+ gcc_argv[i++] = "-lc";
+ gcc_argv[i++] = "-lgcc";
+ //gcc_argv[i++] = "-Wl,--end-group";
+ }
+#ifdef __UCLIBC_CTOR_DTOR__
+ if (ctor_dtor) {
+ if (use_pic) {
+ gcc_argv[i++] = crtend_path[1];
+ } else {
+ gcc_argv[i++] = crtend_path[0];
+ }
+
+ gcc_argv[i++] = crtn_path[use_build_dir];
+ }
+#endif
+ } else {
+ for ( l = 0 ; l < k ; l++ ) {
+ if (gcc_argument[l]) gcc_argv[i++] = gcc_argument[l];
+ }
+ }
+ gcc_argv[i++] = NULL;
+
+ if (verbose) {
+ for ( j = 0 ; gcc_argv[j] ; j++ ) {
+ printf("arg[%2i] = %s\n", j, gcc_argv[j]);
+ }
+ fflush(stdout);
+ }
+ //no need to free memory from xstrcat because we never return...
+#ifdef __UCLIBC_CTOR_DTOR__
+ if (cplusplus && cpp) {
+ execvp(cpp, gcc_argv);
+ fprintf(stderr, "%s: %s\n", cpp, strerror(errno));
+ } else
+#endif
+ {
+ execvp(cc, gcc_argv);
+ fprintf(stderr, "%s: %s\n", cc, strerror(errno));
+ }
+ exit(EXIT_FAILURE);
+}
--- initrd/uClibc-0.9.28/extra/gcc-uClibc/gcc-uClibc.h.toolchain 2005-08-30 19:25:40.000000000 +0200
+++ initrd/uClibc-0.9.28/extra/gcc-uClibc/gcc-uClibc.h 2005-08-30 19:25:40.000000000 +0200
@@ -0,0 +1,14 @@
+/* this file was autogenerated by make */
+#define UCLIBC_TARGET_PREFIX ""
+#define UCLIBC_DEVEL_PREFIX "/home/stewb/rpm/BUILD/initrd/uClibc/"
+#define UCLIBC_BUILD_DIR "/home/stewb/rpm/BUILD/initrd/uClibc-0.9.28"
+#define GCC_BIN "/usr/bin/gcc"
+#define LIBGCC_DIR "/usr/lib/gcc/i586-mandrake-linux-gnu/3.4.1/"
+#define TARGET_ARCH "i386"
+#define DYNAMIC_LINKER "/home/stewb/rpm/BUILD/initrd/uClibc//lib/ld-uClibc.so.0"
+#define BUILD_DYNAMIC_LINKER "/home/stewb/rpm/BUILD/initrd/uClibc-0.9.28/lib/ld-uClibc.so.0"
+#define __UCLIBC_HAS_SHARED__ 1
+#define __UCLIBC_HAS_MMU__ 1
+#undef __HAS_ELF__
+#define __UCLIBC_CTOR_DTOR__ 1
+#define __UCLIBC_PROFILING__ 1
--- initrd/uClibc-0.9.28/extra/gcc-uClibc/i386-uclibc-ld.toolchain 2005-08-30 19:25:40.000000000 +0200
+++ initrd/uClibc-0.9.28/extra/gcc-uClibc/i386-uclibc-ld 2005-08-30 19:25:40.000000000 +0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+# This file was autogenerated by make
+/usr/bin/ld $@ -L/home/stewb/rpm/BUILD/initrd/uClibc//usr/lib -L/home/stewb/rpm/BUILD/initrd/uClibc//lib -L/home/stewb/rpm/BUILD/initrd/uClibc-0.9.28
--- initrd/uClibc-0.9.28/extra/Makefile.toolchain 2005-08-18 00:49:41.000000000 +0200
+++ initrd/uClibc-0.9.28/extra/Makefile 2005-08-30 19:25:40.000000000 +0200
@@ -26,7 +26,7 @@
LIBC=$(TOPDIR)libc.a
-DIRS =
+DIRS = gcc-uClibc
EXTRA_DIRS_TO_CLEAN = config
all: subdirs
@@ -35,7 +35,7 @@
ctags -R
clean: subdirs_clean
- $(RM) *.[oa] *~ core
+ rm -f *.[oa] *~ core
subdirs: $(patsubst %, _dir_%, $(DIRS))
subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS) $(EXTRA_DIRS_TO_CLEAN))
--- initrd/uClibc-0.9.28/Makefile.toolchain 2005-08-18 00:49:49.000000000 +0200
+++ initrd/uClibc-0.9.28/Makefile 2005-08-30 19:25:40.000000000 +0200
@@ -148,7 +148,7 @@
tags:
ctags -R
-install: install_runtime install_dev finished2
+install: install_runtime install_dev install_toolchain finished2
RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
@@ -251,6 +251,7 @@
install_runtime:
ifeq ($(strip $(HAVE_SHARED)),y)
$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib
+ $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)bin
$(INSTALL) -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
$(PREFIX)$(RUNTIME_PREFIX)lib
cp -dRf lib/*.so.* $(PREFIX)$(RUNTIME_PREFIX)lib
@@ -262,6 +263,15 @@
fi;
endif
+install_toolchain:
+ install -d $(PREFIX)$(DEVEL_PREFIX)/lib
+ install -d $(PREFIX)$(DEVEL_PREFIX)/bin
+ DEVEL_TOOL_PREFIX=$(DEVEL_PREFIX)
+ SYSTEM_DEVEL_PREFIX=$(DEVEL_PREFIX)
+ export DEVEL_TOOL_PREFIX SYSTEM_DEVEL_PREFIX
+ $(MAKE) -C extra/gcc-uClibc install
+
+
.PHONY: utils
ifeq ($(strip $(HAVE_SHARED)),y)
utils:
--- initrd/uClibc-0.9.28/Rules.mak.toolchain 2005-08-18 00:49:49.000000000 +0200
+++ initrd/uClibc-0.9.28/Rules.mak 2005-08-30 19:27:15.000000000 +0200
@@ -112,6 +112,9 @@
RUNTIME_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(RUNTIME_PREFIX))))))
DEVEL_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(DEVEL_PREFIX))))))
export RUNTIME_PREFIX DEVEL_PREFIX
+DEVEL_TOOL_PREFIX=$(DEVEL_PREFIX)
+SYSTEM_DEVEL_PREFIX=$(DEVEL_PREFIX)
+export DEVEL_TOOL_PREFIX SYSTEM_DEVEL_PREFIX
ARFLAGS:=cr
