forked from qt-creator/qt-creator
GDB build: Advance to 7.4.1
Change-Id: Ie9d24d879fde99a4fdf5698b4a535be04fd91d34 Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
4
dist/gdb/Makefile.linux
vendored
4
dist/gdb/Makefile.linux
vendored
@@ -5,7 +5,7 @@ staging=${broot}/staging
|
||||
pyversion=2.7
|
||||
expatversion=2.0.1
|
||||
arch=`uname -sm | sed 's/ /-/g' | tr A-Z a-z`
|
||||
version=7.4
|
||||
version=7.4.1
|
||||
targetdir=${broot}/qtcreator-gdb-${version}
|
||||
gdbtargets=$(addprefix ${targetdir}/gdb-, ${targets})
|
||||
packagename=qtcreator-gdb-${version}-${arch}.tar.gz
|
||||
@@ -75,7 +75,7 @@ ${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestag
|
||||
patch -p2 < ${broot}/patches/pythonhome-7.4.patch && \
|
||||
patch -p1 < ${broot}/patches/gdb-buildid-locate.patch && \
|
||||
patch -p1 < ${broot}/patches/gdb-ipv6.patch && \
|
||||
patch -p1 < ${broot}/patches/gdb-work-around-trk-single-step.patch
|
||||
patch -p1 < ${broot}/patches/gdb-work-around-trk-single-step.patch
|
||||
|
||||
${gdbtargets}: ${targetdir}/gdb-%: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a | maketargetdir
|
||||
test -e ${staging}/gdb-${version}-$* || mkdir ${staging}/gdb-${version}-$*
|
||||
|
5
dist/gdb/Makefile.mingw
vendored
5
dist/gdb/Makefile.mingw
vendored
@@ -6,7 +6,7 @@ pyversion=2.7
|
||||
pydir=${broot}/python
|
||||
expatversion=2.0.1
|
||||
iconvversion=1.14
|
||||
version=7.4
|
||||
version=7.4.1
|
||||
targetdir=${broot}/qtcreator-gdb-${version}
|
||||
gdbtargets=$(addprefix ${targetdir}/gdb-, ${targets})
|
||||
packageparts=${targetdir}/lib ${targetdir}/lib ${targetdir}/libiconv-2.dll ${targetdir}/python27.dll ${targetdir}/libexpat-1.dll
|
||||
@@ -78,8 +78,7 @@ ${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestag
|
||||
tar xf ${source}/gdb-${version}.tar.bz2 && \
|
||||
cd gdb-${version} && \
|
||||
touch configure && \
|
||||
patch -p1 < ${broot}/patches/gdb-ipv6.patch && \
|
||||
patch -p1 < ${broot}/patches/gdb-target-debugging.patch
|
||||
patch -p1 < ${broot}/patches/gdb-ipv6.patch
|
||||
|
||||
${staging}/lib/libiconv.a: ${source}/libiconv-${iconvversion}.tar.gz | makestagingdir
|
||||
cd ${staging} && \
|
||||
|
2
dist/gdb/Makefile.osx
vendored
2
dist/gdb/Makefile.osx
vendored
@@ -5,7 +5,7 @@ staging=${broot}/staging
|
||||
pyversion=2.7
|
||||
expatversion=2.0.1
|
||||
arch=`uname -sm | sed 's/ /-/g' | tr A-Z a-z`
|
||||
version=7.4
|
||||
version=7.4.1
|
||||
targetdir=${broot}/qtcreator-gdb-${version}
|
||||
gdbtargets=$(addprefix ${targetdir}/gdb-, ${targets})
|
||||
packagename=qtcreator-gdb-${version}-${arch}.tar.gz
|
||||
|
3
dist/gdb/patches/gdb-ipv6.patch
vendored
3
dist/gdb/patches/gdb-ipv6.patch
vendored
@@ -188,7 +188,7 @@ diff -rup gdb-7.4-clean/gdb/gdbserver/remote-utils.c gdb-7.4/gdb/gdbserver/remot
|
||||
|
||||
port_str = strchr (name, ':');
|
||||
if (port_str == NULL)
|
||||
@@ -227,7 +265,23 @@ remote_prepare (char *name)
|
||||
@@ -227,8 +265,24 @@ remote_prepare (char *name)
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -214,6 +214,7 @@ diff -rup gdb-7.4-clean/gdb/gdbserver/remote-utils.c gdb-7.4/gdb/gdbserver/remot
|
||||
+ if (port_str[1] == '\0')
|
||||
fatal ("Bad port argument: %s", name);
|
||||
|
||||
#ifdef USE_WIN32API
|
||||
@@ -241,24 +295,181 @@ remote_prepare (char *name)
|
||||
}
|
||||
#endif
|
||||
|
19
dist/gdb/patches/gdb-target-debugging.patch
vendored
19
dist/gdb/patches/gdb-target-debugging.patch
vendored
@@ -1,19 +0,0 @@
|
||||
--- src/gdb/infcmd.c 2012/02/15 19:13:13
|
||||
+++ src/gdb/infcmd.c 2012/02/23 08:15:04
|
||||
@@ -1636,6 +1636,7 @@
|
||||
static void
|
||||
finish_forward (struct symbol *function, struct frame_info *frame)
|
||||
{
|
||||
+ struct frame_id frame_id = get_frame_id (frame);
|
||||
struct gdbarch *gdbarch = get_frame_arch (frame);
|
||||
struct symtab_and_line sal;
|
||||
struct thread_info *tp = inferior_thread ();
|
||||
@@ -1653,7 +1654,7 @@
|
||||
|
||||
old_chain = make_cleanup_delete_breakpoint (breakpoint);
|
||||
|
||||
- set_longjmp_breakpoint (tp, get_frame_id (frame));
|
||||
+ set_longjmp_breakpoint (tp, frame_id);
|
||||
make_cleanup (delete_longjmp_breakpoint_cleanup, &thread);
|
||||
|
||||
/* We want stop_registers, please... */
|
@@ -9,7 +9,7 @@ this problem.
|
||||
|
||||
--- a/gdb/infrun.c
|
||||
+++ b/gdb/infrun.c
|
||||
@@ -5061,9 +5061,9 @@ process_event_stop_test:
|
||||
@@ -5186,9 +5186,9 @@
|
||||
return;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user