X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Fcmpmrg_text.c;fp=tools%2Fcmpmrg_text.c;h=3862ef369a720208475d1ad1f1dc13b97e14eece;hb=de50b98baf577c2ab9b9f680ea102c1dad14eb7c;hp=987443ea3208a51f97be5547c63f6175cd687b06;hpb=e56ab892c4ff9eef34f85fab010d7084b9c59e81;p=ia32rtools.git

diff --git a/tools/cmpmrg_text.c b/tools/cmpmrg_text.c
index 987443e..3862ef3 100644
--- a/tools/cmpmrg_text.c
+++ b/tools/cmpmrg_text.c
@@ -474,7 +474,7 @@ static void fill_int3(unsigned char *d, int len)
 
 int main(int argc, char *argv[])
 {
-	unsigned int base = 0, addr, addr2, end, sym, *t;
+	unsigned int base = 0, addr, end, sym, *t;
 	struct my_sect_info s_text_obj, s_text_exe;
 	struct my_symtab *raw_syms_obj = NULL;
 	struct my_symtab *syms_obj = NULL;
@@ -608,10 +608,12 @@ int main(int argc, char *argv[])
 			i--;
 			s_text_obj.reloc_cnt--;
 		}
+#if 0
 		// note: branches/calls already linked,
 		// so only useful for dd refs
+		// XXX: rm'd because of switch tables
 		else if (raw_syms_obj[sym].is_text) {
-			addr2 = raw_syms_obj[sym].addr;
+			unsigned int addr2 = raw_syms_obj[sym].addr;
 			if (s_text_obj.data[addr2] == 0xcc) {
 				printf("warning: reloc %08x -> %08x "
 					"points to rm'd target '%s'\n",
@@ -619,6 +621,7 @@ int main(int argc, char *argv[])
 					raw_syms_obj[sym].name);
 			}
 		}
+#endif
 	}
 
 	// patch .text