]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - arch/arm/boot/compressed/vmlinux.lds.in
Merge branch 'master' into for-linus
[linux-2.6.git] / arch / arm / boot / compressed / vmlinux.lds.in
index cbed030b55cf5057591bc617efdb21b9ecd80222..d08168941bd686b6f7a112f0668e96503c2ba667 100644 (file)
@@ -14,6 +14,13 @@ SECTIONS
   /DISCARD/ : {
     *(.ARM.exidx*)
     *(.ARM.extab*)
+    /*
+     * Discard any r/w data - this produces a link error if we have any,
+     * which is required for PIC decompression.  Local data generates
+     * GOTOFF relocations, which prevents it being relocated independently
+     * of the text/got segments.
+     */
+    *(.data)
   }
 
   . = TEXT_START;
@@ -43,7 +50,6 @@ SECTIONS
   .got                 : { *(.got) }
   _got_end = .;
   .got.plt             : { *(.got.plt) }
-  .data                        : { *(.data) }
   _edata = .;
 
   . = BSS_START;