[valgrind-variant] r124 committed - Revert 2 small changes to the elf reader....

[valgrind...@googlecode.com]

Revision: 124
Author: eug...@google.com
Date: Mon Nov 21 06:39:54 2011
Log: Revert 2 small changes to the elf reader.

One of these does not make any sense, the second appears to be a manual
merge error.

http://code.google.com/p/valgrind-variant/source/detail?r=124

Modified:
/trunk/valgrind/coregrind/m_debuginfo/readelf.c

=======================================
--- /trunk/valgrind/coregrind/m_debuginfo/readelf.c Tue Oct 25 09:11:36 2011
+++ /trunk/valgrind/coregrind/m_debuginfo/readelf.c Mon Nov 21 06:39:54 2011
@@ -1781,7 +1781,7 @@

/* Accept .rodata where mapped as rx (data), even if zero-sized */
if (0 == VG_(strcmp)(name, ".rodata")) {
- if (/*inrx && */size >= 0 && !di->rodata_present) {
+ if (inrx && size >= 0 && !di->rodata_present) {
di->rodata_present = True;
di->rodata_svma = svma;
di->rodata_avma = svma + inrx->bias;
@@ -2037,7 +2037,7 @@
rw (data) instead. We can handle up to N_EHFRAME_SECTS per
ELF object. */
if (0 == VG_(strcmp)(name, ".eh_frame")) {
- if (/*inrx && */size > 0 && di->n_ehframe < N_EHFRAME_SECTS) {
+ if (inrx && size > 0 && di->n_ehframe < N_EHFRAME_SECTS) {
di->ehframe_avma[di->n_ehframe] = svma + inrx->bias;
di->ehframe_size[di->n_ehframe] = size;
TRACE_SYMTAB("acquiring .eh_frame avma = %#lx\n",