summaryrefslogtreecommitdiff
path: root/data/gdb/duplicates.diff
blob: 23bd023248f7a9ca11caaeec5908a5b8f0a5ed5e (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
diff -ru gdb-1461/src/bfd/mach-o.c gdb-1461+iPhone/src/bfd/mach-o.c
--- gdb-1461/src/bfd/mach-o.c	2009-07-23 23:52:42.000000000 +0000
+++ gdb-1461+iPhone/src/bfd/mach-o.c	2010-03-29 06:59:49.000000000 +0000
@@ -264,7 +264,7 @@
 #define BFD_GETL32(addr) ((((((unsigned long) addr[3] << 8) | addr[2]) << 8) | addr[1]) << 8 | addr[0])
 #define BFD_GETL64(addr) ((((((((((unsigned long long) addr[7] << 8) | addr[6]) << 8) | addr[5]) << 8 | addr[4]) << 8 | addr[3]) << 8 | addr[2]) << 8 | addr[1]) << 8 | addr[0])
 
-unsigned char macosx_symbol_types[256];
+static unsigned char macosx_symbol_types[256];
 
 static unsigned char
 bfd_mach_o_symbol_type_base (unsigned char macho_type)
diff -ru gdb-1461/src/gdb/macosx/macosx-tdep.c gdb-1461+iPhone/src/gdb/macosx/macosx-tdep.c
--- gdb-1461/src/gdb/macosx/macosx-tdep.c	2009-11-06 22:25:10.000000000 +0000
+++ gdb-1461+iPhone/src/gdb/macosx/macosx-tdep.c	2010-03-29 06:59:38.000000000 +0000
@@ -131,7 +131,7 @@
 #define BFD_GETL32(addr) ((((((uint32_t) addr[3] << 8) | addr[2]) << 8) | addr[1]) << 8 | addr[0])
 #define BFD_GETL64(addr) ((((((((((uint64_t) addr[7] << 8) | addr[6]) << 8) | addr[5]) << 8 | addr[4]) << 8 | addr[3]) << 8 | addr[2]) << 8 | addr[1]) << 8 | addr[0])
 
-unsigned char macosx_symbol_types[256];
+static unsigned char macosx_symbol_types[256];
 
 static unsigned char
 macosx_symbol_type_base (macho_type)
diff -ru gdb-1461/src/gdb/xcoffread.c gdb-1461+iPhone/src/gdb/xcoffread.c
--- gdb-1461/src/gdb/xcoffread.c	2008-08-06 23:00:53.000000000 +0000
+++ gdb-1461+iPhone/src/gdb/xcoffread.c	2010-03-29 07:31:55.000000000 +0000
@@ -122,7 +122,7 @@
 /* Nonzero if within a function (so symbols should be local,
    if nothing says specifically).  */
 
-int within_function;
+extern int within_function;
 
 /* Size of a COFF symbol.  I think it is always 18, so I'm not sure
    there is any reason not to just use a #define, but might as well