[rtems-tools PATCH] rtems-syms.cpp: Change check to pointer size

Ryan Long ryan.long at oarcorp.com
Wed Jul 20 21:37:46 UTC 2022


Changed from a RISC-V specific value being in the conditional to a check for
the size of the architecture's pointer.

Closes #4673
---
 linkers/rtems-syms.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linkers/rtems-syms.cpp b/linkers/rtems-syms.cpp
index bfe2a48..5aa4d27 100644
--- a/linkers/rtems-syms.cpp
+++ b/linkers/rtems-syms.cpp
@@ -244,7 +244,7 @@ output_sym::operator ()(const rld::symbols::symtab::value_type& value)
 
   if (embed)
   {
-    c.write_line ("#if __riscv_xlen == 64");
+    c.write_line ("#if __SIZEOF_POINTER__ == 8");
     c.write_line ("asm(\"  .quad " + sym.name () + "\");");
     c.write_line ("#else");
     c.write_line ("asm(\"  .long " + sym.name () + "\");");
@@ -254,7 +254,7 @@ output_sym::operator ()(const rld::symbols::symtab::value_type& value)
   {
     std::stringstream oss;
     oss << std::hex << std::setfill ('0') << std::setw (8) << sym.value ();
-    c.write_line ("#if __riscv_xlen == 64");
+    c.write_line ("#if __SIZEOF_POINTER__ == 8");
     c.write_line ("asm(\"  .quad 0x" + oss.str () + "\");");
     c.write_line ("#else");
     c.write_line ("asm(\"  .long 0x" + oss.str () + "\");");
-- 
2.30.2



More information about the devel mailing list