Author: nbd Date: 2015-11-17 13:38:32 +0100 (Tue, 17 Nov 2015) New Revision: 47491
Added: trunk/toolchain/gdb/patches/7.10/ trunk/toolchain/gdb/patches/7.10/100-no_extern_inline.patch trunk/toolchain/gdb/patches/7.10/110-no_testsuite.patch trunk/toolchain/gdb/patches/7.10/120-fix-compile-flag-mismatch.patch trunk/toolchain/gdb/patches/arc-2015.06-gdb/ trunk/toolchain/gdb/patches/arc-2015.06-gdb/100-no_extern_inline.patch trunk/toolchain/gdb/patches/arc-2015.06-gdb/110-no_testsuite.patch trunk/toolchain/gdb/patches/arc-2015.06-gdb/120-fix-compile-flag-mismatch.patch Removed: trunk/toolchain/gdb/patches/100-no_extern_inline.patch trunk/toolchain/gdb/patches/110-no_testsuite.patch trunk/toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch Modified: trunk/toolchain/gdb/Makefile Log: gdb: use separate patches for upstream and ARC gdb With bump of upstream GDB from 7.9 to 7.10 at least 100-no_extern_inline.patch became incompatible with ARC gdb (which is still based on upstream 7.9 branch). So until ARC support is not completely upstreamed (which we expect to happen in coming months) we'll need to have separate patches for ARC gdb. This time clean build-tested for Netgear WNDRMAC & AXS101. Signed-off-by: Alexey Brodkin <[email protected]> Cc: Felix Fietkau <[email protected]> Cc: John Crispin <[email protected]> Cc: Jonas Gorski <[email protected]> Modified: trunk/toolchain/gdb/Makefile =================================================================== --- trunk/toolchain/gdb/Makefile 2015-11-17 12:38:22 UTC (rev 47490) +++ trunk/toolchain/gdb/Makefile 2015-11-17 12:38:32 UTC (rev 47491) @@ -24,6 +24,8 @@ GDB_DIR:=$(PKG_NAME)-$(PKG_VERSION) endif +PATCH_DIR:=./patches/$(PKG_VERSION) + HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(GDB_DIR) HOST_BUILD_PARALLEL:=1 Deleted: trunk/toolchain/gdb/patches/100-no_extern_inline.patch =================================================================== --- trunk/toolchain/gdb/patches/100-no_extern_inline.patch 2015-11-17 12:38:22 UTC (rev 47490) +++ trunk/toolchain/gdb/patches/100-no_extern_inline.patch 2015-11-17 12:38:32 UTC (rev 47491) @@ -1,32 +0,0 @@ ---- a/sim/common/sim-arange.c -+++ b/sim/common/sim-arange.c -@@ -280,11 +280,7 @@ sim_addr_range_delete (ADDR_RANGE *ar, a - build_search_tree (ar); - } - --#endif /* DEFINE_NON_INLINE_P */ -- --#if DEFINE_INLINE_P -- --SIM_ARANGE_INLINE int -+int - sim_addr_range_hit_p (ADDR_RANGE *ar, address_word addr) - { - ADDR_RANGE_TREE *t = ar->range_tree; -@@ -301,4 +297,4 @@ sim_addr_range_hit_p (ADDR_RANGE *ar, ad - return 0; - } - --#endif /* DEFINE_INLINE_P */ -+#endif /* DEFINE_NON_INLINE_P */ ---- a/sim/common/sim-arange.h -+++ b/sim/common/sim-arange.h -@@ -73,7 +73,7 @@ extern void sim_addr_range_delete (ADDR_ - - /* Return non-zero if ADDR is in range AR, traversing the entire tree. - If no range is specified, that is defined to mean "everything". */ --SIM_ARANGE_INLINE int -+extern int - sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/); - #define ADDR_RANGE_HIT_P(ar, addr) \ - ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr))) Deleted: trunk/toolchain/gdb/patches/110-no_testsuite.patch =================================================================== --- trunk/toolchain/gdb/patches/110-no_testsuite.patch 2015-11-17 12:38:22 UTC (rev 47490) +++ trunk/toolchain/gdb/patches/110-no_testsuite.patch 2015-11-17 12:38:32 UTC (rev 47491) @@ -1,21 +0,0 @@ ---- a/gdb/configure -+++ b/gdb/configure -@@ -870,8 +870,7 @@ MAKEINFOFLAGS - YACC - YFLAGS - XMKMF' --ac_subdirs_all='testsuite --gdbtk -+ac_subdirs_all='gdbtk - multi-ice - gdbserver' - -@@ -5610,7 +5610,7 @@ $as_echo "$with_auto_load_safe_path" >&6 - - - --subdirs="$subdirs testsuite" -+subdirs="$subdirs" - - - # Check whether to support alternative target configurations Deleted: trunk/toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch =================================================================== --- trunk/toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch 2015-11-17 12:38:22 UTC (rev 47490) +++ trunk/toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch 2015-11-17 12:38:32 UTC (rev 47491) @@ -1,11 +0,0 @@ ---- a/gdb/gdbserver/configure -+++ b/gdb/gdbserver/configure -@@ -2468,7 +2468,7 @@ $as_echo "$as_me: error: \`$ac_var' was - ac_cache_corrupted=: ;; - ,);; - *) -- if test "x$ac_old_val" != "x$ac_new_val"; then -+ if test "`echo x$ac_old_val`" != "`echo x$ac_new_val`"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` Copied: trunk/toolchain/gdb/patches/7.10/100-no_extern_inline.patch (from rev 47490, trunk/toolchain/gdb/patches/100-no_extern_inline.patch) =================================================================== --- trunk/toolchain/gdb/patches/7.10/100-no_extern_inline.patch (rev 0) +++ trunk/toolchain/gdb/patches/7.10/100-no_extern_inline.patch 2015-11-17 12:38:32 UTC (rev 47491) @@ -0,0 +1,32 @@ +--- a/sim/common/sim-arange.c ++++ b/sim/common/sim-arange.c +@@ -280,11 +280,7 @@ sim_addr_range_delete (ADDR_RANGE *ar, a + build_search_tree (ar); + } + +-#endif /* DEFINE_NON_INLINE_P */ +- +-#if DEFINE_INLINE_P +- +-SIM_ARANGE_INLINE int ++int + sim_addr_range_hit_p (ADDR_RANGE *ar, address_word addr) + { + ADDR_RANGE_TREE *t = ar->range_tree; +@@ -301,4 +297,4 @@ sim_addr_range_hit_p (ADDR_RANGE *ar, ad + return 0; + } + +-#endif /* DEFINE_INLINE_P */ ++#endif /* DEFINE_NON_INLINE_P */ +--- a/sim/common/sim-arange.h ++++ b/sim/common/sim-arange.h +@@ -73,7 +73,7 @@ extern void sim_addr_range_delete (ADDR_ + + /* Return non-zero if ADDR is in range AR, traversing the entire tree. + If no range is specified, that is defined to mean "everything". */ +-SIM_ARANGE_INLINE int ++extern int + sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/); + #define ADDR_RANGE_HIT_P(ar, addr) \ + ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr))) Copied: trunk/toolchain/gdb/patches/7.10/110-no_testsuite.patch (from rev 47490, trunk/toolchain/gdb/patches/110-no_testsuite.patch) =================================================================== --- trunk/toolchain/gdb/patches/7.10/110-no_testsuite.patch (rev 0) +++ trunk/toolchain/gdb/patches/7.10/110-no_testsuite.patch 2015-11-17 12:38:32 UTC (rev 47491) @@ -0,0 +1,21 @@ +--- a/gdb/configure ++++ b/gdb/configure +@@ -870,8 +870,7 @@ MAKEINFOFLAGS + YACC + YFLAGS + XMKMF' +-ac_subdirs_all='testsuite +-gdbtk ++ac_subdirs_all='gdbtk + multi-ice + gdbserver' + +@@ -5610,7 +5610,7 @@ $as_echo "$with_auto_load_safe_path" >&6 + + + +-subdirs="$subdirs testsuite" ++subdirs="$subdirs" + + + # Check whether to support alternative target configurations Copied: trunk/toolchain/gdb/patches/7.10/120-fix-compile-flag-mismatch.patch (from rev 47490, trunk/toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch) =================================================================== --- trunk/toolchain/gdb/patches/7.10/120-fix-compile-flag-mismatch.patch (rev 0) +++ trunk/toolchain/gdb/patches/7.10/120-fix-compile-flag-mismatch.patch 2015-11-17 12:38:32 UTC (rev 47491) @@ -0,0 +1,11 @@ +--- a/gdb/gdbserver/configure ++++ b/gdb/gdbserver/configure +@@ -2468,7 +2468,7 @@ $as_echo "$as_me: error: \`$ac_var' was + ac_cache_corrupted=: ;; + ,);; + *) +- if test "x$ac_old_val" != "x$ac_new_val"; then ++ if test "`echo x$ac_old_val`" != "`echo x$ac_new_val`"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` Copied: trunk/toolchain/gdb/patches/arc-2015.06-gdb/100-no_extern_inline.patch (from rev 47490, trunk/toolchain/gdb/patches/100-no_extern_inline.patch) =================================================================== --- trunk/toolchain/gdb/patches/arc-2015.06-gdb/100-no_extern_inline.patch (rev 0) +++ trunk/toolchain/gdb/patches/arc-2015.06-gdb/100-no_extern_inline.patch 2015-11-17 12:38:32 UTC (rev 47491) @@ -0,0 +1,32 @@ +--- a/sim/common/sim-arange.c ++++ b/sim/common/sim-arange.c +@@ -280,11 +280,7 @@ sim_addr_range_delete (ADDR_RANGE *ar, a + build_search_tree (ar); + } + +-#endif /* DEFINE_NON_INLINE_P */ +- +-#if DEFINE_INLINE_P +- +-SIM_ARANGE_INLINE int ++int + sim_addr_range_hit_p (ADDR_RANGE *ar, address_word addr) + { + ADDR_RANGE_TREE *t = ar->range_tree; +@@ -301,4 +297,4 @@ sim_addr_range_hit_p (ADDR_RANGE *ar, ad + return 0; + } + +-#endif /* DEFINE_INLINE_P */ ++#endif /* DEFINE_NON_INLINE_P */ +--- a/sim/common/sim-arange.h ++++ b/sim/common/sim-arange.h +@@ -62,7 +62,7 @@ extern void sim_addr_range_delete (ADDR_ + + /* Return non-zero if ADDR is in range AR, traversing the entire tree. + If no range is specified, that is defined to mean "everything". */ +-extern INLINE int ++extern int + sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/); + #define ADDR_RANGE_HIT_P(ar, addr) \ + ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr))) Copied: trunk/toolchain/gdb/patches/arc-2015.06-gdb/110-no_testsuite.patch (from rev 47490, trunk/toolchain/gdb/patches/110-no_testsuite.patch) =================================================================== --- trunk/toolchain/gdb/patches/arc-2015.06-gdb/110-no_testsuite.patch (rev 0) +++ trunk/toolchain/gdb/patches/arc-2015.06-gdb/110-no_testsuite.patch 2015-11-17 12:38:32 UTC (rev 47491) @@ -0,0 +1,21 @@ +--- a/gdb/configure ++++ b/gdb/configure +@@ -855,8 +855,7 @@ MAKEINFOFLAGS + YACC + YFLAGS + XMKMF' +-ac_subdirs_all='testsuite +-gdbtk ++ac_subdirs_all='gdbtk + multi-ice + gdbserver' + +@@ -5168,7 +5167,7 @@ $as_echo "$with_auto_load_safe_path" >&6 + + + +-subdirs="$subdirs testsuite" ++subdirs="$subdirs" + + + # Check whether to support alternative target configurations Copied: trunk/toolchain/gdb/patches/arc-2015.06-gdb/120-fix-compile-flag-mismatch.patch (from rev 47490, trunk/toolchain/gdb/patches/120-fix-compile-flag-mismatch.patch) =================================================================== --- trunk/toolchain/gdb/patches/arc-2015.06-gdb/120-fix-compile-flag-mismatch.patch (rev 0) +++ trunk/toolchain/gdb/patches/arc-2015.06-gdb/120-fix-compile-flag-mismatch.patch 2015-11-17 12:38:32 UTC (rev 47491) @@ -0,0 +1,11 @@ +--- a/gdb/gdbserver/configure ++++ b/gdb/gdbserver/configure +@@ -2183,7 +2183,7 @@ $as_echo "$as_me: error: \`$ac_var' was + ac_cache_corrupted=: ;; + ,);; + *) +- if test "x$ac_old_val" != "x$ac_new_val"; then ++ if test "`echo x$ac_old_val`" != "`echo x$ac_new_val`"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
