summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cross/avr-gdb/Makefile9
-rw-r--r--cross/avr-gdb/distinfo15
-rw-r--r--cross/avr-gdb/patches/patch-aa13
-rw-r--r--cross/avr-gdb/patches/patch-ab14
-rw-r--r--cross/avr-gdb/patches/patch-ac4
-rw-r--r--cross/avr-gdb/patches/patch-ad34
-rw-r--r--cross/avr-gdb/patches/patch-bfd_bfd-in2_h27
-rw-r--r--cross/avr-gdb/patches/patch-opcodes_configure24
8 files changed, 66 insertions, 74 deletions
diff --git a/cross/avr-gdb/Makefile b/cross/avr-gdb/Makefile
index 36a66ec2130..f4ea098c0f7 100644
--- a/cross/avr-gdb/Makefile
+++ b/cross/avr-gdb/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.17 2012/10/03 00:10:29 asau Exp $
+# $NetBSD: Makefile,v 1.18 2013/08/07 05:34:14 mef Exp $
-DISTNAME= gdb-5.3
-PKGNAME= avr-gdb-5.3
-PKGREVISION= 3
+DISTNAME= gdb-7.6
+PKGNAME= ${DISTNAME:S/^/avr-/}
CATEGORIES= cross
MASTER_SITES= ${MASTER_SITE_GNU:=gdb/}
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= GNU gdb for Atmel AVR 8-bit RISC microcontrollers
+LICENSE= gnu-gpl-v3
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
@@ -16,6 +16,7 @@ CONFIGURE_ARGS+= --target=avr
CONFIGURE_ARGS+= --program-prefix=avr
INSTALLATION_DIRS= bin
+TEST_TARGET= check
pre-configure:
cd ${WRKSRC} ; ${RM} -rf dejagnu expect sim tcl texinfo
diff --git a/cross/avr-gdb/distinfo b/cross/avr-gdb/distinfo
index 93f85e7089e..9718441cde2 100644
--- a/cross/avr-gdb/distinfo
+++ b/cross/avr-gdb/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.9 2008/06/21 20:32:08 joerg Exp $
+$NetBSD: distinfo,v 1.10 2013/08/07 05:34:14 mef Exp $
-SHA1 (gdb-5.3.tar.gz) = 24a6c9da6e89b1b82b7508f27f94098d989ff662
-RMD160 (gdb-5.3.tar.gz) = 3f88dc11115de08708c50c73b10acaf00ed25e96
-Size (gdb-5.3.tar.gz) = 14707600 bytes
-SHA1 (patch-aa) = 3b2c3c8bbacbf87d9756ef282e4a37c930fcb4af
-SHA1 (patch-ab) = 005c0ca2aea16927504e102f85638a65fd610597
-SHA1 (patch-ac) = 3ad9f172b6a860425b713401d8f2ca87c6b140fd
-SHA1 (patch-ad) = 63912ab42840a2c3e0402db97571d37b936ce0be
+SHA1 (gdb-7.6.tar.gz) = 026f4c9e1c8152a2773354551c523acd32d7f00e
+RMD160 (gdb-7.6.tar.gz) = 986e1f92130c818d9bdac548259a5c63ddeefef8
+Size (gdb-7.6.tar.gz) = 31437633 bytes
+SHA1 (patch-ac) = 2975101bbbd4a2e19fb9364b494a18e3940d9bac
+SHA1 (patch-bfd_bfd-in2_h) = 66129d5e6ecac363f9f35437b0a3ca8e3b650c8c
+SHA1 (patch-opcodes_configure) = 8c0b82710653c93320230c25ace0dbb6360cf656
diff --git a/cross/avr-gdb/patches/patch-aa b/cross/avr-gdb/patches/patch-aa
deleted file mode 100644
index 2b5c5de3d3f..00000000000
--- a/cross/avr-gdb/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/12/19 15:23:29 joerg Exp $
-
---- gdb/target.c.orig 2005-12-19 15:16:32.000000000 +0000
-+++ gdb/target.c
-@@ -36,8 +36,6 @@
- #include <signal.h>
- #include "regcache.h"
-
--extern int errno;
--
- static void target_info (char *, int);
-
- static void cleanup_target (struct target_ops *);
diff --git a/cross/avr-gdb/patches/patch-ab b/cross/avr-gdb/patches/patch-ab
deleted file mode 100644
index d205d23fdd7..00000000000
--- a/cross/avr-gdb/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/11/05 17:14:52 rillig Exp $
-
---- gdb/avr-tdep.c.orig Wed Sep 18 19:14:22 2002
-+++ gdb/avr-tdep.c Sat Nov 5 18:12:23 2005
-@@ -480,6 +480,9 @@ avr_scan_prologue (struct frame_info *fi
- prologue_end = fi->pc;
- else if (sal.end < prologue_end) /* next line begins after fn end */
- prologue_end = sal.end; /* (probably means no prologue) */
-+
-+ /* Check that we don't use a prologue larger then AVR_MAX_PROLOGUE_SIZE */
-+ prologue_end = min (prologue_end, prologue_start + AVR_MAX_PROLOGUE_SIZE);
- }
- else
- /* We're in the boondocks: allow for */
diff --git a/cross/avr-gdb/patches/patch-ac b/cross/avr-gdb/patches/patch-ac
index c449ebd606b..2aa4aee5fe3 100644
--- a/cross/avr-gdb/patches/patch-ac
+++ b/cross/avr-gdb/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2006/10/13 18:25:59 rillig Exp $
+$NetBSD: patch-ac,v 1.2 2013/08/07 05:34:14 mef Exp $
+
+ERROR: [check-portability.awk] => Found test ... == ...:
--- gdb/config/djgpp/djconfig.sh.orig 2002-02-25 17:09:45.000000000 +0100
+++ gdb/config/djgpp/djconfig.sh 2006-10-13 20:25:02.000000000 +0200
diff --git a/cross/avr-gdb/patches/patch-ad b/cross/avr-gdb/patches/patch-ad
deleted file mode 100644
index b98ea711515..00000000000
--- a/cross/avr-gdb/patches/patch-ad
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/06/21 20:32:08 joerg Exp $
-
---- include/obstack.h.orig 2001-03-14 02:27:43.000000000 +0000
-+++ include/obstack.h
-@@ -417,14 +417,12 @@ __extension__ \
- /* These assume that the obstack alignment is good enough for pointers or ints,
- and that the data added so far to the current object
- shares that much alignment. */
--
- # define obstack_ptr_grow(OBSTACK,datum) \
- __extension__ \
- ({ struct obstack *__o = (OBSTACK); \
- if (__o->next_free + sizeof (void *) > __o->chunk_limit) \
- _obstack_newchunk (__o, sizeof (void *)); \
-- *((void **)__o->next_free)++ = ((void *)datum); \
-- (void) 0; })
-+ obstack_ptr_grow_fast (__o, datum); })
-
- # define obstack_int_grow(OBSTACK,datum) \
- __extension__ \
-@@ -434,7 +432,12 @@ __extension__ \
- *((int *)__o->next_free)++ = ((int)datum); \
- (void) 0; })
-
--# define obstack_ptr_grow_fast(h,aptr) (*((void **) (h)->next_free)++ = (void *)aptr)
-+# define obstack_ptr_grow_fast(OBSTACK,aptr) \
-+__extension__ \
-+({ struct obstack *__o1 = (OBSTACK); \
-+ *(const void **) __o1->next_free = (aptr); \
-+ __o1->next_free += sizeof (const void *); \
-+ (void) 0; })
- # define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint)
-
- # define obstack_blank(OBSTACK,length) \
diff --git a/cross/avr-gdb/patches/patch-bfd_bfd-in2_h b/cross/avr-gdb/patches/patch-bfd_bfd-in2_h
new file mode 100644
index 00000000000..2b4f99f615b
--- /dev/null
+++ b/cross/avr-gdb/patches/patch-bfd_bfd-in2_h
@@ -0,0 +1,27 @@
+$NetBSD: patch-bfd_bfd-in2_h,v 1.1 2013/08/07 05:34:14 mef Exp $
+
+Avoid following problem by clang-3.2
+----------------
+libtool: compile: gcc -DHAVE_CONFIG_H -I. -I. -I. -I./../include -DHAVE_bfd_elf32_avr_vec -DHAVE_bfd_elf32_little_generic_vec -DHAVE_bfd_elf32_big_generic_vec -I./../intl -DBINDIR=\"/usr/pkg/bin\" -I/usr/include -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Werror -O2 -I/usr/include -MT opncls.lo -MD -MP -MF .deps/opncls.Tpo -c opncls.c -o opncls.o
+opncls.c:263:5: error: expression result unused [-Werror,-Wunused-value]
+ bfd_set_cacheable (nbfd, TRUE);
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+./bfd.h:529:67: note: expanded from macro 'bfd_set_cacheable'
+#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE)
+ ^~~~
+./bfd.h:134:14: note: expanded from macro 'TRUE'
+#define TRUE 1
+ ^
+1 error generated.
+
+--- bfd/bfd-in2.h.orig 2013-02-28 06:39:18.000000000 +0900
++++ bfd/bfd-in2.h 2013-07-04 21:57:46.000000000 +0900
+@@ -526,7 +526,7 @@ extern void warn_deprecated (const char
+
+ #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
+
+-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE)
++#define bfd_set_cacheable(abfd,bool) ((abfd)->cacheable = bool)
+
+ extern bfd_boolean bfd_cache_close
+ (bfd *abfd);
diff --git a/cross/avr-gdb/patches/patch-opcodes_configure b/cross/avr-gdb/patches/patch-opcodes_configure
new file mode 100644
index 00000000000..0e7faf32907
--- /dev/null
+++ b/cross/avr-gdb/patches/patch-opcodes_configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-opcodes_configure,v 1.1 2013/08/07 05:34:14 mef Exp $
+
+Revert to gdb-7.5.1 to avoid following error
+(But why this is necessary is unkown yet).
+
+Configuring in ./opcodes
+....
+checking for gcc option to accept ISO C89... none needed
+checking for library containing strerror... none required
+./configure.lineno: 3236: Syntax error: Bad substitution
+gmake[1]: *** [configure-opcodes] Error 1
+gmake[1]: Leaving directory `/usr/pkgsrc/wip/gdb76/work/gdb-7.6'
+
+--- opcodes/configure.orig 2013-07-03 10:59:20.000000000 +0900
++++ opcodes/configure 2013-07-03 12:02:37.000000000 +0900
+@@ -3216,7 +3216,7 @@
+ # We currently only use the version number for the name of any shared
+ # library. For user convenience, we always use the same version
+ # number that BFD is using.
+-BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
++BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+
+ am__api_version='1.11'
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-12 20:29:15 +0000