diff options
| author | Chris Johns <chrisj@rtems.org> | 2015-11-12 17:48:45 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2015-11-12 17:48:45 +1100 |
| commit | ab922fec9c2ce403d870120b5afcc108f06f4aea (patch) | |
| tree | 2b5bfab12c42a42c4ee2c981494f0bb7b4053b4a | |
| parent | rtd-rtems.cpp: Default to version 4.12 (diff) | |
| download | rtems-tools-ab922fec9c2ce403d870120b5afcc108f06f4aea.tar.bz2 | |
Add tools patches for RTEMS 4.12.
| -rw-r--r-- | tools/4.12/gdb/gdb-sim-arange-inline.diff | 22 | ||||
| -rw-r--r-- | tools/4.12/gdb/gdb-sim-cgen-inline.diff | 22 | ||||
| -rw-r--r-- | tools/4.12/gdb/patch-gdb-python-python-config.py | 11 |
3 files changed, 55 insertions, 0 deletions
diff --git a/tools/4.12/gdb/gdb-sim-arange-inline.diff b/tools/4.12/gdb/gdb-sim-arange-inline.diff new file mode 100644 index 0000000..73fd1b6 --- /dev/null +++ b/tools/4.12/gdb/gdb-sim-arange-inline.diff @@ -0,0 +1,22 @@ +--- gdb-7.7.orig/sim/common/sim-arange.h 2014-04-10 14:07:37.000000000 +1000 ++++ gdb-7.7/sim/common/sim-arange.h 2014-04-10 14:05:43.000000000 +1000 +@@ -62,17 +62,13 @@ + + /* 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 ++static INLINE 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))) + + #ifdef HAVE_INLINE +-#ifdef SIM_ARANGE_C +-#define SIM_ARANGE_INLINE INLINE +-#else +-#define SIM_ARANGE_INLINE EXTERN_INLINE +-#endif ++#define SIM_ARANGE_INLINE static INLINE + #include "sim-arange.c" + #else + #define SIM_ARANGE_INLINE diff --git a/tools/4.12/gdb/gdb-sim-cgen-inline.diff b/tools/4.12/gdb/gdb-sim-cgen-inline.diff new file mode 100644 index 0000000..85e1e5e --- /dev/null +++ b/tools/4.12/gdb/gdb-sim-cgen-inline.diff @@ -0,0 +1,22 @@ +--- gdb-7.7.orig/sim/common/cgen-ops.h 2014-04-30 09:13:57.000000000 +0000 ++++ gdb-7.7/sim/common/cgen-ops.h 2014-04-30 09:13:48.000000000 +0000 +@@ -26,7 +26,7 @@ + + #if defined (__GNUC__) && ! defined (SEMOPS_DEFINE_INLINE) + #define SEMOPS_DEFINE_INLINE +-#define SEMOPS_INLINE extern inline ++#define SEMOPS_INLINE static inline + #else + #define SEMOPS_INLINE + #endif +--- gdb-7.7.orig/sim/common/cgen-mem.h 2014-04-30 10:37:07.000000000 +0000 ++++ gdb-7.7/sim/common/cgen-mem.h 2014-04-30 10:37:36.000000000 +0000 +@@ -23,7 +23,7 @@ + #ifdef MEMOPS_DEFINE_INLINE + #define MEMOPS_INLINE + #else +-#define MEMOPS_INLINE extern inline ++#define MEMOPS_INLINE static inline + #endif + + /* Integer memory read support. diff --git a/tools/4.12/gdb/patch-gdb-python-python-config.py b/tools/4.12/gdb/patch-gdb-python-python-config.py new file mode 100644 index 0000000..2433240 --- /dev/null +++ b/tools/4.12/gdb/patch-gdb-python-python-config.py @@ -0,0 +1,11 @@ +--- gdb/python/python-config.py.orig 2013-10-17 11:24:52.000000000 +0200 ++++ gdb/python/python-config.py 2013-10-17 11:25:04.000000000 +0200 +@@ -59,6 +59,8 @@ + + elif opt in ('--libs', '--ldflags'): + libs = [] ++ if getvar('LDFLAGS') is not None: ++ libs.extend(getvar('LDFLAGS').split()) + if getvar('LIBS') is not None: + libs.extend(getvar('LIBS').split()) + if getvar('SYSLIBS') is not None: |