summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-07-02 08:08:56 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-07-02 08:08:56 +0000
commitb8bca068fad5ca96569ab1e51e323c529d1c03f4 (patch)
tree4f867911e89466ec82f56d3457fbdbf788a72915
parent2b6c7164848095a0b1298e107232047dad1a9e33 (diff)
add a fix for mtd build with host gcc 4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1315 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/target/linux/image/jffs2/Makefile1
-rw-r--r--openwrt/target/linux/image/jffs2/patches/gcc4-fix.patch12
2 files changed, 13 insertions, 0 deletions
diff --git a/openwrt/target/linux/image/jffs2/Makefile b/openwrt/target/linux/image/jffs2/Makefile
index 8734ee225..d5f03bef4 100644
--- a/openwrt/target/linux/image/jffs2/Makefile
+++ b/openwrt/target/linux/image/jffs2/Makefile
@@ -11,6 +11,7 @@ $(DL_DIR)/$(MTD_SOURCE):
$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
zcat $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+ $(PATCH) $(MTD_DIR) ./patches
touch $(MTD_DIR)/.unpacked
$(MTD_DIR)/util/mkfs.jffs2: $(MTD_DIR)/.unpacked
diff --git a/openwrt/target/linux/image/jffs2/patches/gcc4-fix.patch b/openwrt/target/linux/image/jffs2/patches/gcc4-fix.patch
new file mode 100644
index 000000000..c7a274d9b
--- /dev/null
+++ b/openwrt/target/linux/image/jffs2/patches/gcc4-fix.patch
@@ -0,0 +1,12 @@
+diff -urN mtd-20050122.orig.old/include/mtd/jffs2-user.h mtd-20050122.orig.dev/include/mtd/jffs2-user.h
+--- mtd-20050122.orig.old/include/mtd/jffs2-user.h 2004-05-05 13:57:54.000000000 +0200
++++ mtd-20050122.orig.dev/include/mtd/jffs2-user.h 2005-07-02 10:03:09.000000000 +0200
+@@ -19,8 +19,6 @@
+ #undef je32_to_cpu
+ #undef jemode_to_cpu
+
+-extern int target_endian;
+-
+ #define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); })
+ #define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); })
+