diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-17 19:41:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-17 19:41:13 +0200 |
| commit | c008b8741447a77371f3fd487830bfd7952dbdcd (patch) | |
| tree | d93378254682782dbe0175dcf69edb1fbf65dbe3 /toolchain | |
| parent | 16b627883cdd2fb2258002b30dfa61c440373e9c (diff) | |
| parent | 6d26b19269a28ff576e872473cb3b4610a61fceb (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/patches/no-lib64.patch | 2 | ||||
| -rw-r--r-- | toolchain/uClibc/patches/getline.patch | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/toolchain/gcc/patches/no-lib64.patch b/toolchain/gcc/patches/no-lib64.patch index 25ada0e4e..add17ecb8 100644 --- a/toolchain/gcc/patches/no-lib64.patch +++ b/toolchain/gcc/patches/no-lib64.patch @@ -6,7 +6,7 @@ diff -Nur gcc-4.4.1.orig/gcc/config/i386/linux64.h gcc-4.4.1/gcc/config/i386/lin #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" #undef ASM_SPEC #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \ diff --git a/toolchain/uClibc/patches/getline.patch b/toolchain/uClibc/patches/getline.patch new file mode 100644 index 000000000..fb9f9bcc2 --- /dev/null +++ b/toolchain/uClibc/patches/getline.patch @@ -0,0 +1,30 @@ +diff -Nur uClibc-0.9.30.1.orig/extra/scripts/unifdef.c uClibc-0.9.30.1/extra/scripts/unifdef.c +--- uClibc-0.9.30.1.orig/extra/scripts/unifdef.c 2008-04-28 01:10:00.000000000 +0200 ++++ uClibc-0.9.30.1/extra/scripts/unifdef.c 2009-10-10 12:37:04.230249774 +0200 +@@ -206,7 +206,7 @@ + static void error(const char *); + static int findsym(const char *); + static void flushline(bool); +-static Linetype getline(void); ++static Linetype get_line(void); + static Linetype ifeval(const char **); + static void ignoreoff(void); + static void ignoreon(void); +@@ -512,7 +512,7 @@ + + for (;;) { + linenum++; +- lineval = getline(); ++ lineval = get_line(); + trans_table[ifstate[depth]][lineval](); + debug("process %s -> %s depth %d", + linetype_name[lineval], +@@ -526,7 +526,7 @@ + * help from skipcomment(). + */ + static Linetype +-getline(void) ++get_line(void) + { + const char *cp; + int cursym; |