diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-12 12:05:21 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-12 12:05:21 +0000 |
commit | 88cd79159b0e3101a5b13d7a7936d4edaeda8599 (patch) | |
tree | 2fdd43c02c7f7a989848ca39ca79f1061ed9a588 /target/linux/generic/patches-2.6.38/210-darwin_scripts_include.patch | |
parent | 3d65e0831f50b6daf7c697cfce5abcc0a95b9e4b (diff) | |
download | master-187ad058-88cd79159b0e3101a5b13d7a7936d4edaeda8599.tar.gz master-187ad058-88cd79159b0e3101a5b13d7a7936d4edaeda8599.tar.bz2 master-187ad058-88cd79159b0e3101a5b13d7a7936d4edaeda8599.zip |
linux/2.6.38: R.I.P.
It is used only by the broken coldfire target.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31688 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.38/210-darwin_scripts_include.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.38/210-darwin_scripts_include.patch | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/target/linux/generic/patches-2.6.38/210-darwin_scripts_include.patch b/target/linux/generic/patches-2.6.38/210-darwin_scripts_include.patch deleted file mode 100644 index 0686a38973..0000000000 --- a/target/linux/generic/patches-2.6.38/210-darwin_scripts_include.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- a/scripts/kallsyms.c -+++ b/scripts/kallsyms.c -@@ -22,6 +22,35 @@ - #include <stdlib.h> - #include <string.h> - #include <ctype.h> -+#ifdef __APPLE__ -+/* Darwin has no memmem implementation, this one is ripped of the uClibc-0.9.28 source */ -+void *memmem (const void *haystack, size_t haystack_len, -+ const void *needle, size_t needle_len) -+{ -+ const char *begin; -+ const char *const last_possible -+ = (const char *) haystack + haystack_len - needle_len; -+ -+ if (needle_len == 0) -+ /* The first occurrence of the empty string is deemed to occur at -+ the beginning of the string. */ -+ return (void *) haystack; -+ -+ /* Sanity check, otherwise the loop might search through the whole -+ memory. */ -+ if (__builtin_expect (haystack_len < needle_len, 0)) -+ return NULL; -+ -+ for (begin = (const char *) haystack; begin <= last_possible; ++begin) -+ if (begin[0] == ((const char *) needle)[0] && -+ !memcmp ((const void *) &begin[1], -+ (const void *) ((const char *) needle + 1), -+ needle_len - 1)) -+ return (void *) begin; -+ -+ return NULL; -+} -+#endif - - #ifndef ARRAY_SIZE - #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0])) ---- a/scripts/kconfig/Makefile -+++ b/scripts/kconfig/Makefile -@@ -147,6 +147,9 @@ check-lxdialog := $(srctree)/$(src)/lxd - # we really need to do so. (Do not call gcc as part of make mrproper) - HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \ - -DLOCALE -+ifeq ($(shell uname -s),Darwin) -+HOST_LOADLIBES += -lncurses -+endif - - # =========================================================================== - # Shared Makefile for the various kconfig executables: ---- a/scripts/mod/mk_elfconfig.c -+++ b/scripts/mod/mk_elfconfig.c -@@ -1,7 +1,11 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#ifndef __APPLE__ - #include <elf.h> -+#else -+#include "../../../../../tools/sstrip/include/elf.h" -+#endif - - int - main(int argc, char **argv) ---- a/scripts/mod/modpost.h -+++ b/scripts/mod/modpost.h -@@ -7,7 +7,11 @@ - #include <sys/mman.h> - #include <fcntl.h> - #include <unistd.h> -+#if !(defined(__APPLE__) || defined(__CYGWIN__)) - #include <elf.h> -+#else -+#include "../../../../../tools/sstrip/include/elf.h" -+#endif - - #include "elfconfig.h" - |