9 files changed, 49 insertions, 30 deletions
diff --git a/data/gdb/_metadata/depiction b/data/gdb/_metadata/depiction
new file mode 100644
index 000000000..02675f572
--- /dev/null
+++ b/data/gdb/_metadata/depiction
@@ -0,0 +1 @@
+http://cydia.saurik.com/info/gdb/
diff --git a/data/gdb/_metadata/homepage b/data/gdb/_metadata/homepage
index c15abbd4d..e3791fe66 100644
--- a/data/gdb/_metadata/homepage
+++ b/data/gdb/_metadata/homepage
@@ -1 +1 @@
-http://www.246tnt.com/iPhone/#gdb
+http://www.gnu.org/software/gdb/
diff --git a/data/gdb/_metadata/version b/data/gdb/_metadata/version
index 612eb51c3..754d8e034 100644
--- a/data/gdb/_metadata/version
+++ b/data/gdb/_metadata/version
@@ -1 +1 @@
-961
+962
diff --git a/data/gdb/_unix03.diff b/data/gdb/_unix03.diff
deleted file mode 100644
index 24930a24d..000000000
--- a/data/gdb/_unix03.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru gdb-961/src/gdb/configure.ac gdb-961+iPhone/src/gdb/configure.ac
---- gdb-961/src/gdb/configure.ac	2008-03-05 23:09:41.000000000 +0000
-+++ gdb-961+iPhone/src/gdb/configure.ac	2008-07-04 10:20:50.000000000 +0000
-@@ -897,7 +897,7 @@
- 
- # APPLE LOCAL: Use the pre-conformant headers/functions so we stand a 
- # better chance of running on older systems.
--UNIX03_UGH_CFLAGS=-D__DARWIN_UNIX03=0
-+UNIX03_UGH_CFLAGS=-D__DARWIN_UNIX03=1
- AC_SUBST(UNIX03_UGH_CFLAGS)
- 
- # APPLE LOCAL: Enable MIG checking for macosx/macosx.defs.
diff --git a/data/gdb/gdb-961.tar.gz b/data/gdb/gdb-962.tar.gz
index a2619dbce..a4e781a52 100644
--- a/data/gdb/gdb-961.tar.gz
+++ b/data/gdb/gdb-962.tar.gz
diff --git a/data/gdb/gdbserver.diff b/data/gdb/gdbserver.diff
new file mode 100644
index 000000000..f3242c4cb
--- /dev/null
+++ b/data/gdb/gdbserver.diff
@@ -0,0 +1,21 @@
+diff -ru gdb-962/src/gdb/configure.ac gdb-962+iPhone/src/gdb/configure.ac
+--- gdb-962/src/gdb/configure.ac	2008-03-05 23:09:41.000000000 +0000
++++ gdb-962+iPhone/src/gdb/configure.ac	2008-11-11 05:45:29.000000000 +0000
+@@ -1681,16 +1681,7 @@
+    AC_CONFIG_SUBDIRS(multi-ice)
+ fi
+ 
+-# We only build gdbserver automatically if host and target are the same.
+-if test "x$target" = "x$host"; then
+-  AC_MSG_CHECKING(whether gdbserver is supported on this host)
+-  if test "x$build_gdbserver" = xyes; then
+-    AC_MSG_RESULT(yes)
+-    AC_CONFIG_SUBDIRS(gdbserver)
+-  else
+-    AC_MSG_RESULT(no)
+-  fi
+-fi
++AC_CONFIG_SUBDIRS(gdbserver)
+ 
+ # We build rdi-share on ARM-based targets, as instructed by configure.tgt.
+ if test "x$build_rdi_share" = xyes; then
diff --git a/data/gdb/make.sh b/data/gdb/make.sh
index 86a29857b..8f1b13d18 100644
--- a/data/gdb/make.sh
+++ b/data/gdb/make.sh
@@ -1,8 +1,8 @@
 shopt -s extglob
 pkg:setup
-#cd src/gdb
-#autoconf
-#cd ../..
+cd src/gdb
+autoconf
+cd ../..
 cd ..
 mkdir build
 cd build
@@ -14,4 +14,4 @@ for bin in ar nm ranlib size strings strip; do
     pkg: rm -f "/usr/bin/${bin}"
 done
 pkg: rm -f /usr/lib/libiberty.a
-ldid -S"${PKG_DATA}/gdb.xml" "${PKG_DEST}/usr/bin/gdb"
+ldid -S"${PKG_DATA}/gdb.xml" "${PKG_DEST}/usr/bin/gdb"{,server}
diff --git a/data/gdb/nolongdouble.diff b/data/gdb/nolongdouble.diff
deleted file mode 100644
index 23e91cb6f..000000000
--- a/data/gdb/nolongdouble.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru gdb-952/src/gdb/config/arm/macosx.mh gdb-952+iPhone/src/gdb/config/arm/macosx.mh
---- gdb-952/src/gdb/config/arm/macosx.mh	2008-03-01 01:24:09.000000000 +0000
-+++ gdb-952+iPhone/src/gdb/config/arm/macosx.mh	2008-04-11 07:38:06.000000000 +0000
-@@ -43,7 +43,7 @@
- 
- MH_CFLAGS = -I$(srcdir)/macosx
- 
--MH_CFLAGS += -DUSE_PTHREADS=1 -Wall -Wimplicit -Wno-long-double
-+MH_CFLAGS += -DUSE_PTHREADS=1 -Wall -Wimplicit
- 
- CFM_CFLAGS = -DWITH_CFM=0
- 
diff --git a/data/gdb/out_state_count.diff b/data/gdb/out_state_count.diff
new file mode 100644
index 000000000..2213e90fa
--- /dev/null
+++ b/data/gdb/out_state_count.diff
@@ -0,0 +1,21 @@
+diff -ru gdb-962/src/gdb/gdbserver/macosx-excthread.c gdb-962+iPhone/src/gdb/gdbserver/macosx-excthread.c
+--- gdb-962/src/gdb/gdbserver/macosx-excthread.c	2008-03-01 01:21:40.000000000 +0000
++++ gdb-962+iPhone/src/gdb/gdbserver/macosx-excthread.c	2008-11-11 06:37:08.000000000 +0000
+@@ -260,7 +260,7 @@
+    exception_type_t exception_type, exception_data_t exception_data,
+    mach_msg_type_number_t data_count, thread_state_flavor_t * state_flavor,
+    thread_state_t in_state, mach_msg_type_number_t in_state_count,
+-   thread_state_t out_state, mach_msg_type_number_t out_state_count)
++   thread_state_t out_state, mach_msg_type_number_t *out_state_count)
+ {
+   return KERN_FAILURE;
+ }
+@@ -271,7 +271,7 @@
+    exception_type_t exception_type, exception_data_t exception_data,
+    mach_msg_type_number_t data_count, thread_state_flavor_t * state_flavor,
+    thread_state_t in_state, mach_msg_type_number_t in_state_count,
+-   thread_state_t out_state, mach_msg_type_number_t out_state_count)
++   thread_state_t out_state, mach_msg_type_number_t *out_state_count)
+ {
+   kern_return_t kret;
+