aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@redhat.com>2008-04-11 18:49:40 +0000
committerDavid S. Miller <davem@redhat.com>2008-04-11 18:49:40 +0000
commit7c98e6bbc9817ad159b84603c66e1ab7df1e8309 (patch)
tree6e54f8ed70ff953977954f87e4f18891ebc2b66e
parent24f4d50fc1884b1e3ae516de97d51fe1cfd1fb64 (diff)
downloadgdb-7c98e6bbc9817ad159b84603c66e1ab7df1e8309.zip
gdb-7c98e6bbc9817ad159b84603c66e1ab7df1e8309.tar.gz
gdb-7c98e6bbc9817ad159b84603c66e1ab7df1e8309.tar.bz2
* testsuite/justsyms.t: Start at 0x100.
* testsuite/justsyms_1.cc: Adjust justsyms_string assertion. * script_test_2b.cc (script_test_string_b): Make 8 bytes long. * script_test_2.cc: Adjust string and section length checks.
-rw-r--r--gold/ChangeLog7
-rw-r--r--gold/testsuite/justsyms.t2
-rw-r--r--gold/testsuite/justsyms_1.cc2
-rw-r--r--gold/testsuite/script_test_2.cc4
-rw-r--r--gold/testsuite/script_test_2b.cc2
5 files changed, 12 insertions, 5 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 001760f..907ea27 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-11 David S. Miller <davem@davemloft.net>
+
+ * testsuite/justsyms.t: Start at 0x100.
+ * testsuite/justsyms_1.cc: Adjust justsyms_string assertion.
+ * script_test_2b.cc (script_test_string_b): Make 8 bytes long.
+ * script_test_2.cc: Adjust string and section length checks.
+
2008-04-09 Ian Lance Taylor <iant@google.com>
PR gold/5996
diff --git a/gold/testsuite/justsyms.t b/gold/testsuite/justsyms.t
index 4d68893..45418be 100644
--- a/gold/testsuite/justsyms.t
+++ b/gold/testsuite/justsyms.t
@@ -23,7 +23,7 @@
SECTIONS
{
/* This script is only used for a .o file. */
- . = 0x10000;
+ . = 0x100;
.gold_test : { *(.gold_test) }
.text : { *(.text) }
.data : { *(.data) }
diff --git a/gold/testsuite/justsyms_1.cc b/gold/testsuite/justsyms_1.cc
index 599d8c9..50716b0 100644
--- a/gold/testsuite/justsyms_1.cc
+++ b/gold/testsuite/justsyms_1.cc
@@ -44,7 +44,7 @@ main(int, char**)
{
// The linker script should arrange for this symbol to be exactly at
// address 0x10000.
- assert(reinterpret_cast<uintptr_t>(justsyms_string) == 0x10000);
+ assert(reinterpret_cast<uintptr_t>(justsyms_string) == 0x100);
// However, since the file was linked with --just-symbols, we should
// not be able to actually access the symbol.
diff --git a/gold/testsuite/script_test_2.cc b/gold/testsuite/script_test_2.cc
index 24771aa..6e7e000 100644
--- a/gold/testsuite/script_test_2.cc
+++ b/gold/testsuite/script_test_2.cc
@@ -46,7 +46,7 @@ main(int, char**)
// subalign should move it up to 0x20000020.
for (int i = 0; i < 16; ++i)
assert(start_test_area_1[i] == 0);
- assert(strcmp(start_test_area_1 + 16, "test b") == 0);
+ assert(strcmp(start_test_area_1 + 16, "test bb") == 0);
// Next the string from script_test_2a.o, after the subalign.
for (int i = 16 + 7; i < 48; ++i)
@@ -54,7 +54,7 @@ main(int, char**)
assert(strcmp(start_test_area_1 + 48, "test a") == 0);
// Move four bytes forward to start_data.
- assert(reinterpret_cast<uintptr_t>(start_test_area_1 + 48 + 7 + 4)
+ assert(reinterpret_cast<uintptr_t>(start_test_area_1 + 48 + 8 + 4)
== reinterpret_cast<uintptr_t>(start_data));
assert(memcmp(start_data, "\1\2\0\4\0\0\0\010\0\0\0\0\0\0\0", 15) == 0
|| memcmp(start_data, "\1\0\2\0\0\0\4\0\0\0\0\0\0\0\010", 15) == 0);
diff --git a/gold/testsuite/script_test_2b.cc b/gold/testsuite/script_test_2b.cc
index 5b6100b..9b19eb0 100644
--- a/gold/testsuite/script_test_2b.cc
+++ b/gold/testsuite/script_test_2b.cc
@@ -21,4 +21,4 @@
// MA 02110-1301, USA.
char script_test_string_b[] __attribute__ ((section(".gold_test"))) =
- "test b";
+ "test bb";