diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-30 10:04:23 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-30 10:04:23 +0000 |
commit | 9d7651b528738e9ee62b5e182f565dea24b6f09d (patch) | |
tree | 0543e19ad961b98f8d81909260181282bb95c223 /target/linux/generic/patches-3.10/062-mips_decompressor_memcpy_memset_redefinition.patch | |
parent | 00a548aea80da62f2f5fb88a85f85c0ee16885d6 (diff) | |
download | master-31e0f0ae-9d7651b528738e9ee62b5e182f565dea24b6f09d.tar.gz master-31e0f0ae-9d7651b528738e9ee62b5e182f565dea24b6f09d.tar.bz2 master-31e0f0ae-9d7651b528738e9ee62b5e182f565dea24b6f09d.zip |
linux: fix mips boot decompressor build
Replace the now defunct 062-mips_decompressor_build_fix.patch with another
patch that simply undefines the arch memset and memcpy defines to avoid
syntax errors in the redeclaration.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 44223
Diffstat (limited to 'target/linux/generic/patches-3.10/062-mips_decompressor_memcpy_memset_redefinition.patch')
-rw-r--r-- | target/linux/generic/patches-3.10/062-mips_decompressor_memcpy_memset_redefinition.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/062-mips_decompressor_memcpy_memset_redefinition.patch b/target/linux/generic/patches-3.10/062-mips_decompressor_memcpy_memset_redefinition.patch new file mode 100644 index 0000000000..4a9a714fb4 --- /dev/null +++ b/target/linux/generic/patches-3.10/062-mips_decompressor_memcpy_memset_redefinition.patch @@ -0,0 +1,18 @@ +--- a/arch/mips/boot/compressed/decompress.c ++++ b/arch/mips/boot/compressed/decompress.c +@@ -45,6 +45,7 @@ void error(char *x) + #define STATIC static + + #ifdef CONFIG_KERNEL_GZIP ++#undef memcpy + void *memcpy(void *dest, const void *src, size_t n) + { + int i; +@@ -59,6 +60,7 @@ void *memcpy(void *dest, const void *src + #endif + + #ifdef CONFIG_KERNEL_BZIP2 ++#undef memset + void *memset(void *s, int c, size_t n) + { + int i; |