- Merge gdb-6.3-gstack-without-path-20060414.p* into
gdb-6.3-gstack-20050411.p*, no real code change.
This commit is contained in:
parent
2e2f074f03
commit
a63256c33f
|
@ -4,10 +4,9 @@
|
||||||
to install and uninstall.
|
to install and uninstall.
|
||||||
* gstack.sh, gstack.1: New files.
|
* gstack.sh, gstack.1: New files.
|
||||||
|
|
||||||
Index: gdb-6.8.91.20090917/gdb/Makefile.in
|
diff -up -ruNp gdb-7.0.1-empty/gdb/Makefile.in gdb-7.0.1/gdb/Makefile.in
|
||||||
===================================================================
|
--- gdb-7.0.1-empty/gdb/Makefile.in 2010-04-07 20:36:04.000000000 +0200
|
||||||
--- gdb-6.8.91.20090917.orig/gdb/Makefile.in 2009-09-17 12:47:07.000000000 +0200
|
+++ gdb-7.0.1/gdb/Makefile.in 2010-04-07 20:36:42.000000000 +0200
|
||||||
+++ gdb-6.8.91.20090917/gdb/Makefile.in 2009-09-17 12:47:38.000000000 +0200
|
|
||||||
@@ -989,7 +989,7 @@ install: all install-only
|
@@ -989,7 +989,7 @@ install: all install-only
|
||||||
|
|
||||||
# The "install-only" target also installs the syscalls' XML files in
|
# The "install-only" target also installs the syscalls' XML files in
|
||||||
|
@ -63,10 +62,9 @@ Index: gdb-6.8.91.20090917/gdb/Makefile.in
|
||||||
|
|
||||||
# The C++ name parser can be built standalone for testing.
|
# The C++ name parser can be built standalone for testing.
|
||||||
test-cp-name-parser.o: cp-name-parser.c
|
test-cp-name-parser.o: cp-name-parser.c
|
||||||
Index: gdb-6.8.91.20090917/gdb/gstack.sh
|
diff -up -ruNp gdb-7.0.1-empty/gdb/gstack.sh gdb-7.0.1/gdb/gstack.sh
|
||||||
===================================================================
|
--- gdb-7.0.1-empty/gdb/gstack.sh 1970-01-01 01:00:00.000000000 +0100
|
||||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
+++ gdb-7.0.1/gdb/gstack.sh 2010-04-07 20:36:47.000000000 +0200
|
||||||
+++ gdb-6.8.91.20090917/gdb/gstack.sh 2009-09-17 12:47:14.000000000 +0200
|
|
||||||
@@ -0,0 +1,48 @@
|
@@ -0,0 +1,48 @@
|
||||||
+#!/bin/sh
|
+#!/bin/sh
|
||||||
+
|
+
|
||||||
|
@ -87,17 +85,17 @@ Index: gdb-6.8.91.20090917/gdb/gstack.sh
|
||||||
+backtrace="bt"
|
+backtrace="bt"
|
||||||
+if test -d /proc/$1/task ; then
|
+if test -d /proc/$1/task ; then
|
||||||
+ # Newer kernel; has a task/ directory.
|
+ # Newer kernel; has a task/ directory.
|
||||||
+ if test `ls /proc/$1/task | wc -l` -gt 1 2>/dev/null ; then
|
+ if test `/bin/ls /proc/$1/task | /usr/bin/wc -l` -gt 1 2>/dev/null ; then
|
||||||
+ backtrace="thread apply all bt"
|
+ backtrace="thread apply all bt"
|
||||||
+ fi
|
+ fi
|
||||||
+elif test -f /proc/$1/maps ; then
|
+elif test -f /proc/$1/maps ; then
|
||||||
+ # Older kernel; go by it loading libpthread.
|
+ # Older kernel; go by it loading libpthread.
|
||||||
+ if grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
|
+ if /bin/grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
|
||||||
+ backtrace="thread apply all bt"
|
+ backtrace="thread apply all bt"
|
||||||
+ fi
|
+ fi
|
||||||
+fi
|
+fi
|
||||||
+
|
+
|
||||||
+GDB=${GDB:-gdb}
|
+GDB=${GDB:-/usr/bin/gdb}
|
||||||
+
|
+
|
||||||
+if $GDB -nx --quiet --batch --readnever > /dev/null 2>&1; then
|
+if $GDB -nx --quiet --batch --readnever > /dev/null 2>&1; then
|
||||||
+ readnever=--readnever
|
+ readnever=--readnever
|
||||||
|
@ -112,7 +110,7 @@ Index: gdb-6.8.91.20090917/gdb/gstack.sh
|
||||||
+set pagination no
|
+set pagination no
|
||||||
+$backtrace
|
+$backtrace
|
||||||
+EOF
|
+EOF
|
||||||
+sed -n \
|
+/bin/sed -n \
|
||||||
+ -e 's/^(gdb) //' \
|
+ -e 's/^(gdb) //' \
|
||||||
+ -e '/^#/p' \
|
+ -e '/^#/p' \
|
||||||
+ -e '/^Thread/p'
|
+ -e '/^Thread/p'
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
Index: gdb-6.3/gdb/gstack.sh
|
|
||||||
===================================================================
|
|
||||||
--- gdb-6.3.orig/gdb/gstack.sh 2006-02-14 17:21:05.000000000 -0200
|
|
||||||
+++ gdb-6.3/gdb/gstack.sh 2006-04-14 03:17:12.000000000 -0300
|
|
||||||
@@ -17,17 +17,17 @@ fi
|
|
||||||
backtrace="bt"
|
|
||||||
if test -d /proc/$1/task ; then
|
|
||||||
# Newer kernel; has a task/ directory.
|
|
||||||
- if test `ls /proc/$1/task | wc -l` -gt 1 2>/dev/null ; then
|
|
||||||
+ if test `/bin/ls /proc/$1/task | /usr/bin/wc -l` -gt 1 2>/dev/null ; then
|
|
||||||
backtrace="thread apply all bt"
|
|
||||||
fi
|
|
||||||
elif test -f /proc/$1/maps ; then
|
|
||||||
# Older kernel; go by it loading libpthread.
|
|
||||||
- if grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
|
|
||||||
+ if /bin/grep -e libpthread /proc/$1/maps > /dev/null 2>&1 ; then
|
|
||||||
backtrace="thread apply all bt"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
-GDB=${GDB:-gdb}
|
|
||||||
+GDB=${GDB:-/usr/bin/gdb}
|
|
||||||
|
|
||||||
if $GDB -nx --quiet --batch --readnever > /dev/null 2>&1; then
|
|
||||||
readnever=--readnever
|
|
||||||
@@ -39,7 +39,7 @@ fi
|
|
||||||
set pagination no
|
|
||||||
$backtrace
|
|
||||||
EOF
|
|
||||||
-sed -n \
|
|
||||||
+/bin/sed -n \
|
|
||||||
-e 's/^(gdb) //' \
|
|
||||||
-e '/^#/p' \
|
|
||||||
-e '/^Thread/p'
|
|
11
gdb.spec
11
gdb.spec
|
@ -36,7 +36,7 @@ Version: 7.0.1
|
||||||
|
|
||||||
# The release always contains a leading reserved number, start it at 1.
|
# The release always contains a leading reserved number, start it at 1.
|
||||||
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
|
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
|
||||||
Release: 41%{?_with_upstream:.upstream}%{dist}
|
Release: 42%{?_with_upstream:.upstream}%{dist}
|
||||||
|
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Group: Development/Debuggers
|
Group: Development/Debuggers
|
||||||
|
@ -183,10 +183,6 @@ Patch170: gdb-6.3-bt-past-zero-20051201.patch
|
||||||
# Use bigger numbers than int.
|
# Use bigger numbers than int.
|
||||||
Patch176: gdb-6.3-large-core-20051206.patch
|
Patch176: gdb-6.3-large-core-20051206.patch
|
||||||
|
|
||||||
# Hard-code executable names in gstack, such that it can run with a
|
|
||||||
# corrupted or missing PATH.
|
|
||||||
Patch177: gdb-6.3-gstack-without-path-20060414.patch
|
|
||||||
|
|
||||||
# Fix debuginfo addresses resolving for --emit-relocs Linux kernels (BZ 203661).
|
# Fix debuginfo addresses resolving for --emit-relocs Linux kernels (BZ 203661).
|
||||||
Patch188: gdb-6.5-bz203661-emit-relocs.patch
|
Patch188: gdb-6.5-bz203661-emit-relocs.patch
|
||||||
|
|
||||||
|
@ -663,7 +659,6 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
|
||||||
%patch169 -p1
|
%patch169 -p1
|
||||||
%patch170 -p1
|
%patch170 -p1
|
||||||
%patch176 -p1
|
%patch176 -p1
|
||||||
%patch177 -p1
|
|
||||||
%patch188 -p1
|
%patch188 -p1
|
||||||
%patch190 -p1
|
%patch190 -p1
|
||||||
%patch194 -p1
|
%patch194 -p1
|
||||||
|
@ -1089,6 +1084,10 @@ fi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Apr 7 2010 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.0.1-42.fc12
|
||||||
|
- Merge gdb-6.3-gstack-without-path-20060414.p* into gdb-6.3-gstack-20050411.p*,
|
||||||
|
no real code change.
|
||||||
|
|
||||||
* Mon Apr 5 2010 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.0.1-41.fc12
|
* Mon Apr 5 2010 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.0.1-41.fc12
|
||||||
- Fix also false warning: section .dynbss not found in ...
|
- Fix also false warning: section .dynbss not found in ...
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue