Hopefully correct code for C's strict aliasing rules

[proxmark3-svn] / bootrom / ldscript-flash

diff --git a/bootrom/ldscript-flash b/bootrom/ldscript-flash
index 50218d684e5cefe5e12130cecd0863032e50bb69..ccc0db2ffef2e297f6faeda354d7bca7af52b9b4 100644 (file)
--- a/bootrom/ldscript-flash
+++ b/bootrom/ldscript-flash
@@ -5,15 +5,32 @@ SECTIONS
 {\r
     . = 0;\r
     \r
-    bootphase1 : {\r
+    .bootphase1 : {\r
        *(.startup) \r
        *(.bootphase1)\r
+       \r
+       /* It seems to be impossible to flush align a section at the\r
+          end of a memory segment. Instead, we'll put the version_information\r
+          wherever the linker wants it, and then put a pointer to the start\r
+          of the version information at the end of the section.\r
+          -- Henryk Plötz <henryk@ploetzli.ch> 2009-08-28 */\r
+          \r
+       _version_information_start = ABSOLUTE(.);\r
+       *(.version_information);\r
+       \r
+       /* Why doesn't this work even though _bootphase1_version_pointer = 0x1001fc?\r
+         . = _bootphase1_version_pointer - ORIGIN(bootphase1); */\r
+       /* This works, apparently it fools the linker into accepting an absolute address */\r
+       . = _bootphase1_version_pointer - ORIGIN(bootphase1) + ORIGIN(bootphase1);\r
+       LONG(_version_information_start)\r
     } >bootphase1\r
     \r
-    bootphase2 : {\r
+    __bootphase2_src_start__ = ORIGIN(bootphase2);\r
+    .bootphase2 : {\r
        __bootphase2_start__ = .;\r
        *(.startphase2)\r
        *(.text)\r
+       *(.eh_frame)\r
        *(.glue_7)\r
        *(.glue_7t)\r
        *(.rodata)\r
@@ -29,4 +46,8 @@ SECTIONS
     \r
     . = ALIGN( 32 / 8 );\r
     __bss_end__ = .;\r
+    \r
+    .commonarea (NOLOAD) : {\r
+       *(.commonarea)\r
+    } >commonarea\r
 }\r