From: Roman Divacky <rdivacky@freebsd.org>
Date: Mon, 20 Dec 2010 20:49:43 +0000 (+0000)
Subject: Print all 64bits for st_value and st_size. Adjust tests accordingly.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1ae3c165f7f6dd265f136d975f255c18de53a960;p=oota-llvm.git

Print all 64bits for st_value and st_size. Adjust tests accordingly.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122263 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/MC/ELF/abs.s b/test/MC/ELF/abs.s
index d7fa0c03882..c598b11e291 100644
--- a/test/MC/ELF/abs.s
+++ b/test/MC/ELF/abs.s
@@ -12,5 +12,5 @@
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x0000fff1)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
diff --git a/test/MC/ELF/alias-reloc.s b/test/MC/ELF/alias-reloc.s
index 6ad11343aec..c908c12404d 100644
--- a/test/MC/ELF/alias-reloc.s
+++ b/test/MC/ELF/alias-reloc.s
@@ -23,8 +23,8 @@ foo2:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 
 // CHECK:      # Symbol 0x00000006
@@ -33,8 +33,8 @@ foo2:
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000004)
-// CHECK-NEXT:  ('st_value', 0x00000005)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000005)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 
 // CHECK:       # Relocation 0x00000000
diff --git a/test/MC/ELF/alias.s b/test/MC/ELF/alias.s
index 98ef50b50f5..42d54bc431d 100644
--- a/test/MC/ELF/alias.s
+++ b/test/MC/ELF/alias.s
@@ -22,8 +22,8 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000002
 // CHECK-NEXT: (('st_name', 0x0000001d) # 'bar4'
@@ -31,8 +31,8 @@ bar4 = foo4
 // CHECK-NEXT:  ('st_type', 0x00000002)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT:  # Symbol 0x00000003
 // CHECK-NEXT:  (('st_name', 0x00000001) # 'foo'
@@ -40,8 +40,8 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT:  # Symbol 0x00000004
 // CHECK-NEXT:  (('st_name', 0x0000000e) # 'foo3'
@@ -49,8 +49,8 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000005
 // CHECK-NEXT: (('st_name', 0x00000018) # 'foo4'
@@ -58,8 +58,8 @@ bar4 = foo4
 // CHECK-NEXT:  ('st_type', 0x00000002)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000006
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
@@ -73,13 +73,13 @@ bar4 = foo4
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK:       # Symbol 0x0000000a
 // CHECK-NEXT:  (('st_name', 0x00000009) # 'bar2'
 // CHECK-NEXT:   ('st_bind', 0x00000001)
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
diff --git a/test/MC/ELF/comdat.s b/test/MC/ELF/comdat.s
index 745dfbbdc8b..0f1164e8206 100644
--- a/test/MC/ELF/comdat.s
+++ b/test/MC/ELF/comdat.s
@@ -48,8 +48,8 @@
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000007)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000002
 // CHECK-NEXT: (('st_name', 0x00000004) # 'g2'
@@ -57,8 +57,8 @@
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000002)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 
 // CHECK:      # Symbol 0x0000000d
@@ -67,8 +67,8 @@
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 
 
diff --git a/test/MC/ELF/common.s b/test/MC/ELF/common.s
index 0ffa6f45463..16b677b9e88 100644
--- a/test/MC/ELF/common.s
+++ b/test/MC/ELF/common.s
@@ -13,8 +13,8 @@
 // CHECK-NEXT: ('st_type', 0x00000001)
 // CHECK-NEXT: ('st_other', 0x00000000)
 // CHECK-NEXT: ('st_shndx',
-// CHECK-NEXT: ('st_value', 0x00000000)
-// CHECK-NEXT: ('st_size', 0x00000001)
+// CHECK-NEXT: ('st_value', 0x0000000000000000)
+// CHECK-NEXT: ('st_size', 0x0000000000000001)
 
 
 // Same as common1, but with directives in a different order.
@@ -27,8 +27,8 @@
 // CHECK-NEXT: ('st_type', 0x00000001)
 // CHECK-NEXT: ('st_other', 0x00000000)
 // CHECK-NEXT: ('st_shndx',
-// CHECK-NEXT: ('st_value', 0x00000001)
-// CHECK-NEXT: ('st_size', 0x00000001)
+// CHECK-NEXT: ('st_value', 0x0000000000000001)
+// CHECK-NEXT: ('st_size', 0x0000000000000001)
 
         .local	common6
         .comm	common6,8,16
@@ -39,8 +39,8 @@
 // CHECK-NEXT:  ('st_type', 0x00000001)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000003)
-// CHECK-NEXT:  ('st_value', 0x00000010)
-// CHECK-NEXT:  ('st_size', 0x00000008)
+// CHECK-NEXT:  ('st_value', 0x0000000000000010)
+// CHECK-NEXT:  ('st_size', 0x0000000000000008)
 // CHECK-NEXT: ),
 
 // Test that without an explicit .local we produce a global.
@@ -52,8 +52,8 @@
 // CHECK-NEXT: ('st_type', 0x00000001)
 // CHECK-NEXT: ('st_other', 0x00000000)
 // CHECK-NEXT: ('st_shndx', 0x0000fff2)
-// CHECK-NEXT: ('st_value', 0x00000004)
-// CHECK-NEXT: ('st_size', 0x00000004)
+// CHECK-NEXT: ('st_value', 0x0000000000000004)
+// CHECK-NEXT: ('st_size', 0x0000000000000004)
 
 
 // Test that without an explicit .local we produce a global, even if the first
@@ -72,8 +72,8 @@ foo:
 // CHECK-NEXT: ('st_type', 0x00000001)
 // CHECK-NEXT: ('st_other', 0x00000000)
 // CHECK-NEXT: ('st_shndx', 0x0000fff2)
-// CHECK-NEXT: ('st_value', 0x00000010)
-// CHECK-NEXT: ('st_size', 0x00000028)
+// CHECK-NEXT: ('st_value', 0x0000000000000010)
+// CHECK-NEXT: ('st_size', 0x0000000000000028)
 
         .comm	common5,4,4
 
@@ -83,6 +83,6 @@ foo:
 // CHECK-NEXT:  ('st_type', 0x00000001)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x0000fff2)
-// CHECK-NEXT:  ('st_value', 0x00000004)
-// CHECK-NEXT:  ('st_size', 0x00000004)
+// CHECK-NEXT:  ('st_value', 0x0000000000000004)
+// CHECK-NEXT:  ('st_size', 0x0000000000000004)
 // CHECK-NEXT: ),
diff --git a/test/MC/ELF/file.s b/test/MC/ELF/file.s
index 8dd72a70ceb..d8ccbe6e5ae 100644
--- a/test/MC/ELF/file.s
+++ b/test/MC/ELF/file.s
@@ -10,8 +10,8 @@ foa:
 // CHECK-NEXT:     ('st_type', 0x00000004)
 // CHECK-NEXT:     ('st_other', 0x00000000)
 // CHECK-NEXT:     ('st_shndx', 0x0000fff1)
-// CHECK-NEXT:     ('st_value', 0x00000000)
-// CHECK-NEXT:     ('st_size', 0x00000000)
+// CHECK-NEXT:     ('st_value', 0x0000000000000000)
+// CHECK-NEXT:     ('st_size', 0x0000000000000000)
 // CHECK-NEXT:    ),
 // CHECK-NEXT:    # Symbol 0x00000002
 // CHECK-NEXT:    (('st_name', 0x00000005) # 'foa'
@@ -19,5 +19,5 @@ foa:
 // CHECK-NEXT:     ('st_type', 0x00000000)
 // CHECK-NEXT:     ('st_other', 0x00000000)
 // CHECK-NEXT:     ('st_shndx', 0x00000001)
-// CHECK-NEXT:     ('st_value', 0x00000000)
-// CHECK-NEXT:     ('st_size', 0x00000000)
+// CHECK-NEXT:     ('st_value', 0x0000000000000000)
+// CHECK-NEXT:     ('st_size', 0x0000000000000000)
diff --git a/test/MC/ELF/local-reloc.s b/test/MC/ELF/local-reloc.s
index d275646b759..c2b477188cb 100644
--- a/test/MC/ELF/local-reloc.s
+++ b/test/MC/ELF/local-reloc.s
@@ -17,8 +17,8 @@ foo:
 // CHECK-NEXT:     ('st_type', 0x00000003)
 // CHECK-NEXT:     ('st_other', 0x00000000)
 // CHECK-NEXT:     ('st_shndx', 0x00000001)
-// CHECK-NEXT:     ('st_value', 0x00000000)
-// CHECK-NEXT:     ('st_size', 0x00000000)
+// CHECK-NEXT:     ('st_value', 0x0000000000000000)
+// CHECK-NEXT:     ('st_size', 0x0000000000000000)
 
 // Relocation refers to symbol number 2
 // CHECK:      ('_relocations', [
diff --git a/test/MC/ELF/pic-diff.s b/test/MC/ELF/pic-diff.s
index b47c4135df0..d1fc909dba8 100644
--- a/test/MC/ELF/pic-diff.s
+++ b/test/MC/ELF/pic-diff.s
@@ -6,8 +6,8 @@
 // CHECK-NEXT:     ('st_type', 0x00000000)
 // CHECK-NEXT:     ('st_other', 0x00000000)
 // CHECK-NEXT:     ('st_shndx', 0x00000000)
-// CHECK-NEXT:     ('st_value', 0x00000000)
-// CHECK-NEXT:     ('st_size', 0x00000000)
+// CHECK-NEXT:     ('st_value', 0x0000000000000000)
+// CHECK-NEXT:     ('st_size', 0x0000000000000000)
 // CHECK-NEXT:    ),
 
 // CHECK:       ('_relocations', [
diff --git a/test/MC/ELF/rename.s b/test/MC/ELF/rename.s
index 290fff63ea1..36065603e78 100644
--- a/test/MC/ELF/rename.s
+++ b/test/MC/ELF/rename.s
@@ -35,8 +35,8 @@ defined3:
 // CHECK-NEXT:  ('st_type', 0x00000003)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 
 // The relocation uses symbol 2
 // CHECK:      # Relocation 0x00000000
diff --git a/test/MC/ELF/set.s b/test/MC/ELF/set.s
index a782bedfdbf..ddc7c5bb111 100644
--- a/test/MC/ELF/set.s
+++ b/test/MC/ELF/set.s
@@ -16,6 +16,6 @@
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
diff --git a/test/MC/ELF/symref.s b/test/MC/ELF/symref.s
index f1563e58adc..b99e71b869b 100644
--- a/test/MC/ELF/symref.s
+++ b/test/MC/ELF/symref.s
@@ -28,8 +28,8 @@ global1:
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000002
 // CHECK-NEXT: (('st_name', 0x00000025) # 'bar3@@zed'
@@ -37,8 +37,8 @@ global1:
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000003
 // CHECK-NEXT: (('st_name', 0x0000002f) # 'bar5@@zed'
@@ -46,8 +46,8 @@ global1:
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000004
 // CHECK-NEXT: (('st_name', 0x00000001) # 'defined1'
@@ -55,8 +55,8 @@ global1:
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000005
 // CHECK-NEXT: (('st_name', 0x0000000a) # 'defined2'
@@ -64,8 +64,8 @@ global1:
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000006
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
@@ -73,8 +73,8 @@ global1:
 // CHECK-NEXT:  ('st_type', 0x00000003)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000007
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
@@ -82,8 +82,8 @@ global1:
 // CHECK-NEXT:  ('st_type', 0x00000003)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000002)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000008
 // CHECK-NEXT: (('st_name', 0x00000000) # ''
@@ -91,8 +91,8 @@ global1:
 // CHECK-NEXT:  ('st_type', 0x00000003)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000003)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000009
 // CHECK-NEXT: (('st_name', 0x0000004a) # 'g1@@zed'
@@ -100,8 +100,8 @@ global1:
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
-// CHECK-NEXT:  ('st_value', 0x00000014)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000014)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x0000000a
 // CHECK-NEXT: (('st_name', 0x00000042) # 'global1'
@@ -109,8 +109,8 @@ global1:
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
-// CHECK-NEXT:  ('st_value', 0x00000014)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000014)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x0000000b
 // CHECK-NEXT: (('st_name', 0x0000001c) # 'bar2@zed'
@@ -118,8 +118,8 @@ global1:
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x0000000c
 // CHECK-NEXT: (('st_name', 0x00000039) # 'bar6@zed'
@@ -127,8 +127,8 @@ global1:
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT:])
 
diff --git a/test/MC/ELF/tls.s b/test/MC/ELF/tls.s
index 2591659f7eb..2517a5bddc1 100644
--- a/test/MC/ELF/tls.s
+++ b/test/MC/ELF/tls.s
@@ -15,8 +15,8 @@ foobar:
 // CHECK-NEXT:  ('st_type', 0x00000006)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000004)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 
 // CHECK:       # Symbol 0x00000007
@@ -25,8 +25,8 @@ foobar:
 // CHECK-NEXT:   ('st_type', 0x00000006)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000008
 // CHECK-NEXT:  (('st_name', 0x00000006) # 'foo2'
@@ -34,8 +34,8 @@ foobar:
 // CHECK-NEXT:   ('st_type', 0x00000006)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000009
 // CHECK-NEXT:  (('st_name', 0x0000000b) # 'foo3'
@@ -43,6 +43,6 @@ foobar:
 // CHECK-NEXT:   ('st_type', 0x00000006)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
diff --git a/test/MC/ELF/type.s b/test/MC/ELF/type.s
index a2d07878ea5..4b98c02e97d 100644
--- a/test/MC/ELF/type.s
+++ b/test/MC/ELF/type.s
@@ -18,8 +18,8 @@ bar:
 // CHECK-NEXT:  ('st_type', 0x00000001)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000005
 // CHECK-NEXT: (('st_name', 0x00000001) # 'foo'
@@ -27,6 +27,6 @@ bar:
 // CHECK-NEXT:  ('st_type', 0x00000002)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000001)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
diff --git a/test/MC/ELF/undef.s b/test/MC/ELF/undef.s
index cdef5e47393..fc3a2d23be3 100644
--- a/test/MC/ELF/undef.s
+++ b/test/MC/ELF/undef.s
@@ -40,7 +40,7 @@
 // CHECK-NEXT:   ('st_type', 0x00000001)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:   ),
 // CHECK-NEXT:  ])
diff --git a/test/MC/ELF/weak.s b/test/MC/ELF/weak.s
index f1a66b5e03c..67e9b188eb0 100644
--- a/test/MC/ELF/weak.s
+++ b/test/MC/ELF/weak.s
@@ -15,8 +15,8 @@ bar:
 //CHECK-NEXT:    ('st_type', 0x00000000)
 //CHECK-NEXT:    ('st_other', 0x00000000)
 //CHECK-NEXT:    ('st_shndx', 0x00000001)
-//CHECK-NEXT:    ('st_value', 0x00000004)
-//CHECK-NEXT:    ('st_size', 0x00000000)
+//CHECK-NEXT:    ('st_value', 0x0000000000000004)
+//CHECK-NEXT:    ('st_size', 0x0000000000000000)
 //CHECK-NEXT:   ),
 //CHECK-NEXT:   # Symbol 0x00000005
 //CHECK:       (('st_name', 0x00000001) # 'foo'
@@ -24,7 +24,7 @@ bar:
 //CHECK-NEXT:   ('st_type', 0x00000000)
 //CHECK-NEXT:   ('st_other', 0x00000000)
 //CHECK-NEXT:   ('st_shndx', 0x00000000)
-//CHECK-NEXT:   ('st_value', 0x00000000)
-//CHECK-NEXT:   ('st_size', 0x00000000)
+//CHECK-NEXT:   ('st_value', 0x0000000000000000)
+//CHECK-NEXT:   ('st_size', 0x0000000000000000)
 //CHECK-NEXT:  ),
 //CHECK-NEXT: ])
diff --git a/test/MC/ELF/weakref-reloc.s b/test/MC/ELF/weakref-reloc.s
index 580d754bc6a..c7cd7649d6f 100644
--- a/test/MC/ELF/weakref-reloc.s
+++ b/test/MC/ELF/weakref-reloc.s
@@ -13,8 +13,8 @@
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000005
 // CHECK-NEXT: (('st_name', 0x00000001) # 'foo'
@@ -22,8 +22,8 @@
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 // CHECK-NEXT: # Symbol 0x00000006
 // CHECK-NEXT: (('st_name', 0x00000005) # 'zed'
@@ -31,8 +31,8 @@
 // CHECK-NEXT:  ('st_type', 0x00000000)
 // CHECK-NEXT:  ('st_other', 0x00000000)
 // CHECK-NEXT:  ('st_shndx', 0x00000000)
-// CHECK-NEXT:  ('st_value', 0x00000000)
-// CHECK-NEXT:  ('st_size', 0x00000000)
+// CHECK-NEXT:  ('st_value', 0x0000000000000000)
+// CHECK-NEXT:  ('st_size', 0x0000000000000000)
 // CHECK-NEXT: ),
 
 // CHECK:      # Relocation 0x00000000
diff --git a/test/MC/ELF/weakref.s b/test/MC/ELF/weakref.s
index 212e2c3c52f..aea10d1d929 100644
--- a/test/MC/ELF/weakref.s
+++ b/test/MC/ELF/weakref.s
@@ -75,8 +75,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000001
 // CHECK-NEXT:  (('st_name', 0x00000015) # 'bar6'
@@ -84,8 +84,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000018)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000018)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000002
 // CHECK-NEXT:  (('st_name', 0x0000001a) # 'bar7'
@@ -93,8 +93,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000018)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000018)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000003
 // CHECK-NEXT:  (('st_name', 0x0000001f) # 'bar8'
@@ -102,8 +102,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x0000001c)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x000000000000001c)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000004
 // CHECK-NEXT:  (('st_name', 0x00000024) # 'bar9'
@@ -111,8 +111,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000020)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000020)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000005
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
@@ -120,8 +120,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000003)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000006
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
@@ -129,8 +129,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000003)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000002)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000007
 // CHECK-NEXT:  (('st_name', 0x00000000) # ''
@@ -138,8 +138,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000003)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000003)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000008
 // CHECK-NEXT:  (('st_name', 0x00000029) # 'bar10'
@@ -147,8 +147,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000028)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000028)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000009
 // CHECK-NEXT:  (('st_name', 0x0000002f) # 'bar11'
@@ -156,8 +156,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000030)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000030)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x0000000a
 // CHECK-NEXT:  (('st_name', 0x00000035) # 'bar12'
@@ -165,8 +165,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000030)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000030)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x0000000b
 // CHECK-NEXT:  (('st_name', 0x0000003b) # 'bar13'
@@ -174,8 +174,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000034)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000034)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x0000000c
 // CHECK-NEXT:  (('st_name', 0x00000041) # 'bar14'
@@ -183,8 +183,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000038)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000038)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x0000000d
 // CHECK-NEXT:  (('st_name', 0x00000047) # 'bar15'
@@ -192,8 +192,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000001)
-// CHECK-NEXT:   ('st_value', 0x00000040)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000040)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x0000000e
 // CHECK-NEXT:  (('st_name', 0x00000001) # 'bar2'
@@ -201,8 +201,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x0000000f
 // CHECK-NEXT:  (('st_name', 0x00000006) # 'bar3'
@@ -210,8 +210,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000010
 // CHECK-NEXT:  (('st_name', 0x0000000b) # 'bar4'
@@ -219,8 +219,8 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT:  # Symbol 0x00000011
 // CHECK-NEXT:  (('st_name', 0x00000010) # 'bar5'
@@ -228,7 +228,7 @@ bar15:
 // CHECK-NEXT:   ('st_type', 0x00000000)
 // CHECK-NEXT:   ('st_other', 0x00000000)
 // CHECK-NEXT:   ('st_shndx', 0x00000000)
-// CHECK-NEXT:   ('st_value', 0x00000000)
-// CHECK-NEXT:   ('st_size', 0x00000000)
+// CHECK-NEXT:   ('st_value', 0x0000000000000000)
+// CHECK-NEXT:   ('st_size', 0x0000000000000000)
 // CHECK-NEXT:  ),
 // CHECK-NEXT: ])
diff --git a/test/Scripts/elf-dump b/test/Scripts/elf-dump
index 2d470c8c8f7..76cdbf91c73 100755
--- a/test/Scripts/elf-dump
+++ b/test/Scripts/elf-dump
@@ -121,8 +121,8 @@ def dumpSymtab(f, section, strtab):
         print "     ('st_other', %s)" % common_dump.HexDump(f.read8())
         print "     ('st_shndx', %s)" % common_dump.HexDump(f.read16())
         if f.is64Bit:
-            print "     ('st_value', %s)" % common_dump.HexDump(f.read64())
-            print "     ('st_size', %s)" % common_dump.HexDump(f.read64())
+            print "     ('st_value', %s)" % common_dump.HexDump(f.read64(), 64)
+            print "     ('st_size', %s)" % common_dump.HexDump(f.read64(), 64)
         print "    ),"
 
 def dumpRel(f, section, dumprela = False):