summaryrefslogtreecommitdiff
blob: d457c4b4febc2f6a238297f5496a1289d04341b4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
diff -ur gputils-0.13.4.orig/ChangeLog gputils-0.13.4/ChangeLog
--- gputils-0.13.4.orig/ChangeLog	2006-08-20 00:24:14.000000000 +0200
+++ gputils-0.13.4/ChangeLog	2007-03-27 23:44:01.000000000 +0200
@@ -1,3 +1,6 @@
+2006-12-16 Scott Dattalo <scott@dattalo.com>
+  * [gpasm] Patch from David Barnett to fix 'Duplicate Label' bug.
+
 2006-08-19 Craig Franklin <craigfranklin@users.sourceforge.net>
   * gputils 0.13.4 Released.
   * [gputils] Updated header files and linker scripts.
diff -ur gputils-0.13.4.orig/gpasm/evaluate.c gputils-0.13.4/gpasm/evaluate.c
--- gputils-0.13.4.orig/gpasm/evaluate.c	2006-08-19 16:06:41.000000000 +0200
+++ gputils-0.13.4/gpasm/evaluate.c	2007-03-27 23:49:38.000000000 +0200
@@ -433,7 +433,8 @@
     if (strcmp(p->value.symbol, "$") == 0) {
       char buffer[BUFSIZ];
       
-      snprintf(buffer, sizeof(buffer), "_$_%06x", state.org << _16bit_core);
+      snprintf(buffer, sizeof(buffer), "_%s_%06x", state.obj.new_sec_name,
+                       state.org << _16bit_core);
       set_global(buffer, state.org << _16bit_core, PERMANENT, gvt_static);
       s = get_symbol(state.stTop, buffer);
     } else {
diff -ur gputils-0.13.4.orig/gpasm/Makefile.in gputils-0.13.4/gpasm/Makefile.in
--- gputils-0.13.4.orig/gpasm/Makefile.in	2006-08-20 00:20:43.000000000 +0200
+++ gputils-0.13.4/gpasm/Makefile.in	2007-03-27 23:45:34.000000000 +0200
@@ -15,6 +15,8 @@
 @SET_MAKE@
 
 
+SOURCES = $(libgpasm_a_SOURCES) $(gpasm_SOURCES)
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
diff -ur gputils-0.13.4.orig/gplink/Makefile.in gputils-0.13.4/gplink/Makefile.in
--- gputils-0.13.4.orig/gplink/Makefile.in	2006-08-20 00:20:43.000000000 +0200
+++ gputils-0.13.4/gplink/Makefile.in	2007-03-27 23:50:19.000000000 +0200
@@ -14,6 +14,8 @@
 
 @SET_MAKE@
 
+SOURCES = $(gplink_SOURCES)
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
diff -ur gputils-0.13.4.orig/gputils/Makefile.in gputils-0.13.4/gputils/Makefile.in
--- gputils-0.13.4.orig/gputils/Makefile.in	2006-08-20 00:20:43.000000000 +0200
+++ gputils-0.13.4/gputils/Makefile.in	2007-03-27 23:50:53.000000000 +0200
@@ -14,6 +14,8 @@
 
 @SET_MAKE@
 
+SOURCES = $(gpdasm_SOURCES) $(gplib_SOURCES) $(gpstrip_SOURCES) $(gpvc_SOURCES) $(gpvo_SOURCES)
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
diff -ur gputils-0.13.4.orig/libgputils/Makefile.in gputils-0.13.4/libgputils/Makefile.in
--- gputils-0.13.4.orig/libgputils/Makefile.in	2006-08-20 00:20:43.000000000 +0200
+++ gputils-0.13.4/libgputils/Makefile.in	2007-03-27 23:51:45.000000000 +0200
@@ -14,6 +14,8 @@
 
 @SET_MAKE@
 
+SOURCES = $(libgputils_a_SOURCES)
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
diff -ur gputils-0.13.4.orig/libiberty/Makefile.in gputils-0.13.4/libiberty/Makefile.in
--- gputils-0.13.4.orig/libiberty/Makefile.in	2006-08-20 00:20:44.000000000 +0200
+++ gputils-0.13.4/libiberty/Makefile.in	2007-03-27 23:52:36.000000000 +0200
@@ -14,6 +14,8 @@
 
 @SET_MAKE@
 
+SOURCES = $(libiberty_a_SOURCES)
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@