gdb: Refresh patches against git
Drop dead patches sim-install.patch, uclibc.patch Change-Id: I5bd160d0959154896096ebc93a8a450d04979c73 (From OE-Core rev: 682ab52d776d74fb5ede949505f72b4c15ae8191) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
683942be6f
commit
0fa5b047cc
|
@ -1,4 +1,4 @@
|
|||
require gdb-cross.inc
|
||||
require gdb-${PV}.inc
|
||||
|
||||
SRC_URI += "file://sim-install-6.6.patch"
|
||||
SRC_URI += "file://0001-make-man-install-relative-to-DESTDIR.patch"
|
||||
|
|
|
@ -2,8 +2,9 @@ require gdb-common.inc
|
|||
|
||||
inherit gettext
|
||||
|
||||
SRC_URI += "file://gdbserver-cflags-last.diff;striplevel=0 \
|
||||
file://renesas-sh-native-support.patch \
|
||||
SRC_URI += "file://0002-Change-order-of-CFLAGS.patch \
|
||||
file://0003-Add-support-for-Renesas-SH-sh4-architecture.patch \
|
||||
file://0004-Change-comment-in-gdb-compile.patch \
|
||||
"
|
||||
#LDFLAGS_append = " -s"
|
||||
#export CFLAGS_append=" -L${STAGING_LIBDIR}"
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
From d3ec939b82be23e7c9534cdc7502645f6c5856d1 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 2 Mar 2015 02:27:55 +0000
|
||||
Subject: [PATCH 1/3] make man install relative to DESTDIR
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
sim/common/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in
|
||||
index d49a93b..2121c46 100644
|
||||
--- a/sim/common/Makefile.in
|
||||
+++ b/sim/common/Makefile.in
|
||||
@@ -35,7 +35,7 @@ tooldir = $(libdir)/$(target_alias)
|
||||
datarootdir = @datarootdir@
|
||||
datadir = @datadir@
|
||||
mandir = @mandir@
|
||||
-man1dir = $(mandir)/man1
|
||||
+man1dir = $(DESTDIR)$(mandir)/man1
|
||||
infodir = @infodir@
|
||||
includedir = @includedir@
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
|
@ -1,13 +1,21 @@
|
|||
Upstream-Status: Pending
|
||||
From 0dcb0a8b139b44ae84e8fd8ff8130cbbb52e444d Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 2 Mar 2015 02:29:23 +0000
|
||||
Subject: [PATCH 2/3] Change order of CFLAGS
|
||||
|
||||
Lets us override Werror if need be
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
gdb/gdbserver/Makefile.in | 4 ++--
|
||||
gdb/gdbserver/Makefile.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: gdb/gdbserver/Makefile.in
|
||||
===================================================================
|
||||
--- gdb/gdbserver/Makefile.in.orig
|
||||
+++ gdb/gdbserver/Makefile.in
|
||||
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
|
||||
index 1ed2ec8..0cef95b 100644
|
||||
--- a/gdb/gdbserver/Makefile.in
|
||||
+++ b/gdb/gdbserver/Makefile.in
|
||||
@@ -131,10 +131,10 @@ CFLAGS = @CFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
|
||||
|
@ -21,3 +29,6 @@ Index: gdb/gdbserver/Makefile.in
|
|||
|
||||
# LDFLAGS is specifically reserved for setting from the command line
|
||||
# when running make.
|
||||
--
|
||||
2.1.4
|
||||
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,48 @@
|
|||
Upstream-Status: Backport
|
||||
|
||||
From 09de64b93c2402e068daf0bce1c4a1dda833b646 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Kratochvil <jan.kratochvil@redhat.com>
|
||||
Date: Thu, 26 Feb 2015 11:52:28 +0100
|
||||
Subject: [PATCH] Change // comment in gdb/compile/
|
||||
|
||||
gdb/ChangeLog
|
||||
2015-02-26 Jan Kratochvil <jan.kratochvil@redhat.com>
|
||||
|
||||
PR build/18033
|
||||
* compile/compile-c-support.c (c_compute_program): Change // comment.
|
||||
* compile/compile-object-load.c (setup_sections): Change // comment.
|
||||
---
|
||||
gdb/ChangeLog | 6 ++++++
|
||||
gdb/compile/compile-c-support.c | 2 +-
|
||||
gdb/compile/compile-object-load.c | 2 +-
|
||||
3 files changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gdb/compile/compile-c-support.c b/gdb/compile/compile-c-support.c
|
||||
index 8f1f45d..1711cda 100644
|
||||
--- a/gdb/compile/compile-c-support.c
|
||||
+++ b/gdb/compile/compile-c-support.c
|
||||
@@ -351,7 +351,7 @@ c_compute_program (struct compile_instance *inst,
|
||||
" __gdb_intptr;\n",
|
||||
buf);
|
||||
|
||||
- // Iterate all log2 sizes in bytes supported by c_get_mode_for_size.
|
||||
+ /* Iterate all log2 sizes in bytes supported by c_get_mode_for_size. */
|
||||
for (i = 0; i < 4; ++i)
|
||||
{
|
||||
const char *mode = c_get_mode_for_size (1 << i);
|
||||
diff --git a/gdb/compile/compile-object-load.c b/gdb/compile/compile-object-load.c
|
||||
index 5903f18..e187970 100644
|
||||
--- a/gdb/compile/compile-object-load.c
|
||||
+++ b/gdb/compile/compile-object-load.c
|
||||
@@ -67,7 +67,7 @@ setup_sections (bfd *abfd, asection *sect, void *data_voidp)
|
||||
if ((bfd_get_section_flags (abfd, sect) & SEC_ALLOC) == 0)
|
||||
return;
|
||||
|
||||
- // Make the memory always readable.
|
||||
+ /* Make the memory always readable. */
|
||||
prot = GDB_MMAP_PROT_READ;
|
||||
if ((bfd_get_section_flags (abfd, sect) & SEC_READONLY) == 0)
|
||||
prot |= GDB_MMAP_PROT_WRITE;
|
||||
--
|
||||
2.1.4
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
--- gdb-6.1/sim/common/Makefile.in~ 2004-01-15 21:25:06.000000000 +0000
|
||||
+++ gdb-6.1/sim/common/Makefile.in 2004-07-22 17:07:46.237809032 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
datadir = @datadir@
|
||||
mandir = @mandir@
|
||||
-man1dir = $(mandir)/man1
|
||||
+man1dir = $(DESTDIR)$(mandir)/man1
|
||||
infodir = @infodir@
|
||||
includedir = @includedir@
|
||||
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
--- gdb-6.1/sim/common/Makefile.in~ 2004-01-15 21:25:06.000000000 +0000
|
||||
+++ gdb-6.1/sim/common/Makefile.in 2004-07-22 17:07:46.237809032 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
datadir = @datadir@
|
||||
mandir = @mandir@
|
||||
-man1dir = $(mandir)/man1
|
||||
+man1dir = $(DESTDIR)$(mandir)/man1
|
||||
infodir = @infodir@
|
||||
includedir = @includedir@
|
||||
|
||||
|
||||
--- gdb-6.1/sim/common/Make-common.in~sim-install.patch 2003-09-08 18:24:59.000000000 +0100
|
||||
+++ gdb-6.1/sim/common/Make-common.in 2004-07-22 17:56:18.947423032 +0100
|
||||
@@ -581,14 +581,14 @@
|
||||
|
||||
install-common: installdirs
|
||||
n=`echo run | sed '$(program_transform_name)'`; \
|
||||
- $(INSTALL_PROGRAM) run$(EXEEXT) $(bindir)/$$n$(EXEEXT)
|
||||
+ $(INSTALL_PROGRAM) run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
|
||||
n=`echo libsim.a | sed s/libsim.a/lib$(target_alias)-sim.a/`; \
|
||||
- $(INSTALL_DATA) libsim.a $(libdir)/$$n ; \
|
||||
- ( cd $(libdir) ; $(RANLIB) $$n )
|
||||
+ $(INSTALL_DATA) libsim.a $(DESTDIR)$(libdir)/$$n ; \
|
||||
+ ( cd $(DESTDIR)$(libdir) ; $(RANLIB) $$n )
|
||||
|
||||
installdirs:
|
||||
- $(SHELL) $(srcdir)/../../mkinstalldirs $(bindir)
|
||||
- $(SHELL) $(srcdir)/../../mkinstalldirs $(libdir)
|
||||
+ $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(bindir)
|
||||
+ $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(libdir)
|
||||
|
||||
check:
|
||||
cd ../testsuite && $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS)"
|
|
@ -1,196 +0,0 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
--- binutils-2.15.91.0.1/bfd/config.bfd~binutils-2.15.90.0.3-uclibc-100-conf
|
||||
+++ binutils-2.15.91.0.1/bfd/config.bfd
|
||||
@@ -128,7 +128,7 @@
|
||||
targ_defvec=ecoffalpha_little_vec
|
||||
targ_selvecs=bfd_elf64_alpha_vec
|
||||
;;
|
||||
- alpha*-*-linux-gnu* | alpha*-*-elf*)
|
||||
+ alpha*-*-linux-gnu* | alpha*-*-linux-uclibc* | alpha*-*-elf*)
|
||||
targ_defvec=bfd_elf64_alpha_vec
|
||||
targ_selvecs=ecoffalpha_little_vec
|
||||
;;
|
||||
@@ -138,7 +138,7 @@
|
||||
alpha*-*-*)
|
||||
targ_defvec=ecoffalpha_little_vec
|
||||
;;
|
||||
- ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf* | ia64*-*-kfreebsd*-gnu)
|
||||
+ ia64*-*-freebsd* | ia64*-*-netbsd* | ia64*-*-linux-gnu* | ia64*-*-elf* | ia64*-*-linux-uclibc* | ia64*-*-kfreebsd*-gnu)
|
||||
targ_defvec=bfd_elf64_ia64_little_vec
|
||||
targ_selvecs="bfd_elf64_ia64_big_vec bfd_efi_app_ia64_vec"
|
||||
;;
|
||||
@@ -215,7 +215,7 @@
|
||||
targ_defvec=bfd_elf32_littlearm_vec
|
||||
targ_selvecs=bfd_elf32_bigarm_vec
|
||||
;;
|
||||
- armeb-*-elf | arm*b-*-linux-gnu*)
|
||||
+ armeb-*-elf | arm*b-*-linux-gnu* | arm*b-*-linux-uclibc*)
|
||||
targ_defvec=bfd_elf32_bigarm_vec
|
||||
targ_selvecs=bfd_elf32_littlearm_vec
|
||||
;;
|
||||
@@ -223,8 +223,8 @@
|
||||
targ_defvec=bfd_elf32_littlearm_vec
|
||||
targ_selvecs=bfd_elf32_bigarm_vec
|
||||
;;
|
||||
- arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \
|
||||
- arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks)
|
||||
+ arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-linux-uclibc* | \
|
||||
+ arm*-*-conix* | arm*-*-uclinux* | arm-*-kfreebsd*-gnu | arm-*-vxworks)
|
||||
targ_defvec=bfd_elf32_littlearm_vec
|
||||
targ_selvecs=bfd_elf32_bigarm_vec
|
||||
;;
|
||||
@@ -367,7 +367,7 @@
|
||||
;;
|
||||
|
||||
#ifdef BFD64
|
||||
- hppa*64*-*-linux-gnu*)
|
||||
+ hppa*64*-*-linux-gnu* | hppa*64*-*-linux-uclibc*)
|
||||
targ_defvec=bfd_elf64_hppa_linux_vec
|
||||
targ_selvecs=bfd_elf64_hppa_vec
|
||||
;;
|
||||
@@ -378,7 +378,7 @@
|
||||
;;
|
||||
#endif
|
||||
|
||||
- hppa*-*-linux-gnu* | hppa*-*-netbsd*)
|
||||
+ hppa*-*-linux-gnu* | hppa*-*-netbsd* | hppa*-*-linux-uclibc*)
|
||||
targ_defvec=bfd_elf32_hppa_linux_vec
|
||||
targ_selvecs=bfd_elf32_hppa_vec
|
||||
;;
|
||||
@@ -501,7 +501,7 @@
|
||||
targ_selvecs=bfd_elf32_i386_vec
|
||||
targ_underscore=yes
|
||||
;;
|
||||
- i[3-7]86-*-linux-gnu*)
|
||||
+ i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*)
|
||||
targ_defvec=bfd_elf32_i386_vec
|
||||
targ_selvecs="i386linux_vec bfd_efi_app_ia32_vec"
|
||||
targ64_selvecs=bfd_elf64_x86_64_vec
|
||||
@@ -515,7 +515,7 @@
|
||||
targ_defvec=bfd_elf64_x86_64_vec
|
||||
targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec bfd_efi_app_ia32_vec"
|
||||
;;
|
||||
- x86_64-*-linux-gnu*)
|
||||
+ x86_64-*-linux-gnu* | x86_64-*-linux-uclibc*)
|
||||
targ_defvec=bfd_elf64_x86_64_vec
|
||||
targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
|
||||
;;
|
||||
@@ -690,7 +690,7 @@
|
||||
targ_selvecs=bfd_elf32_m68k_vec
|
||||
targ_underscore=yes
|
||||
;;
|
||||
- m68*-*-linux-gnu*)
|
||||
+ m68*-*-linux-gnu* | m68*-*-linux-uclibc*)
|
||||
targ_defvec=bfd_elf32_m68k_vec
|
||||
targ_selvecs=m68klinux_vec
|
||||
;;
|
||||
@@ -966,7 +966,8 @@
|
||||
;;
|
||||
#endif
|
||||
powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
|
||||
- powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-rtems* | \
|
||||
+ powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-linux-uclibc* | \
|
||||
+ powerpc-*-rtems* | \
|
||||
powerpc-*-chorus* | powerpc-*-vxworks* | powerpc-*-windiss*)
|
||||
targ_defvec=bfd_elf32_powerpc_vec
|
||||
targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
|
||||
@@ -1003,8 +1004,8 @@
|
||||
targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
|
||||
;;
|
||||
powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
|
||||
- powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-vxworks* |\
|
||||
- powerpcle-*-rtems*)
|
||||
+ powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-linux-uclibc* |\
|
||||
+ powerpcle-*-vxworks* | powerpcle-*-rtems*)
|
||||
targ_defvec=bfd_elf32_powerpcle_vec
|
||||
targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
|
||||
targ64_selvecs="bfd_elf64_powerpc_vec bfd_elf64_powerpcle_vec"
|
||||
@@ -1165,7 +1166,7 @@
|
||||
targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
|
||||
targ_underscore=yes
|
||||
;;
|
||||
- sparc-*-linux-gnu*)
|
||||
+ sparc-*-linux-gnu* | sparc-*-linux-uclibc*)
|
||||
targ_defvec=bfd_elf32_sparc_vec
|
||||
targ_selvecs="sparclinux_vec bfd_elf64_sparc_vec sunos_big_vec"
|
||||
;;
|
||||
@@ -1212,7 +1213,7 @@
|
||||
targ_defvec=sunos_big_vec
|
||||
targ_underscore=yes
|
||||
;;
|
||||
- sparc64-*-linux-gnu*)
|
||||
+ sparc64-*-linux-gnu* | sparc64-*-linux-uclibc*)
|
||||
targ_defvec=bfd_elf64_sparc_vec
|
||||
targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
|
||||
;;
|
||||
--- binutils-2.15.91.0.1/bfd/configure~binutils-2.15.90.0.3-uclibc-100-conf
|
||||
+++ binutils-2.15.91.0.1/bfd/configure
|
||||
@@ -1687,6 +1687,11 @@
|
||||
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
|
||||
;;
|
||||
|
||||
+linux-uclibc*)
|
||||
+ lt_cv_deplibs_check_method=pass_all
|
||||
+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
|
||||
+ ;;
|
||||
+
|
||||
netbsd*)
|
||||
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
|
||||
lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
|
||||
@@ -5266,7 +5271,7 @@
|
||||
alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
|
||||
COREFILE=''
|
||||
;;
|
||||
- alpha*-*-linux-gnu*)
|
||||
+ alpha*-*-linux-gnu* | alpha*-*-linux-uclibc*)
|
||||
COREFILE=trad-core.lo
|
||||
TRAD_HEADER='"hosts/alphalinux.h"'
|
||||
;;
|
||||
@@ -5326,7 +5331,7 @@
|
||||
COREFILE=trad-core.lo
|
||||
TRAD_HEADER='"hosts/i386mach3.h"'
|
||||
;;
|
||||
- i[3-7]86-*-linux-gnu*)
|
||||
+ i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*)
|
||||
COREFILE=trad-core.lo
|
||||
TRAD_HEADER='"hosts/i386linux.h"'
|
||||
;;
|
||||
@@ -5364,7 +5369,7 @@
|
||||
COREFILE=trad-core.lo
|
||||
TRAD_HEADER='"hosts/hp300bsd.h"'
|
||||
;;
|
||||
- m68*-*-linux-gnu*)
|
||||
+ m68*-*-linux-gnu* | m68*-*-linux-uclibc*)
|
||||
COREFILE=trad-core.lo
|
||||
TRAD_HEADER='"hosts/m68klinux.h"'
|
||||
;;
|
||||
--- binutils-2.15.91.0.1/bfd/configure.in~binutils-2.15.90.0.3-uclibc-100-conf
|
||||
+++ binutils-2.15.91.0.1/bfd/configure.in
|
||||
@@ -164,7 +164,7 @@
|
||||
alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
|
||||
COREFILE=''
|
||||
;;
|
||||
- alpha*-*-linux-gnu*)
|
||||
+ alpha*-*-linux-gnu* | alpha*-*-linux-uclibc*)
|
||||
COREFILE=trad-core.lo
|
||||
TRAD_HEADER='"hosts/alphalinux.h"'
|
||||
;;
|
||||
@@ -245,7 +245,7 @@
|
||||
TRAD_HEADER='"hosts/i386mach3.h"'
|
||||
;;
|
||||
changequote(,)dnl
|
||||
- i[3-7]86-*-linux-gnu*)
|
||||
+ i[3-7]86-*-linux-gnu* | i[3-7]86-*-linux-uclibc*)
|
||||
changequote([,])dnl
|
||||
COREFILE=trad-core.lo
|
||||
TRAD_HEADER='"hosts/i386linux.h"'
|
||||
@@ -286,7 +286,7 @@
|
||||
COREFILE=trad-core.lo
|
||||
TRAD_HEADER='"hosts/hp300bsd.h"'
|
||||
;;
|
||||
- m68*-*-linux-gnu*)
|
||||
+ m68*-*-linux-gnu* | m68*-*-linux-uclibc*)
|
||||
COREFILE=trad-core.lo
|
||||
TRAD_HEADER='"hosts/m68klinux.h"'
|
||||
;;
|
Loading…
Reference in New Issue