Move lib_$ARCH directories to arch/$ARCH/lib

[pandora-u-boot.git] / board / rbc823 / u-boot.lds

diff --git a/board/rbc823/u-boot.lds b/board/rbc823/u-boot.lds
index 8247430..6074c14 100644 (file)
--- a/board/rbc823/u-boot.lds
+++ b/board/rbc823/u-boot.lds
@@ -57,7 +57,7 @@ SECTIONS
 
     cpu/mpc8xx/start.o (.text)
     common/dlmalloc.o  (.text)
-    lib_ppc/ppcstring.o        (.text)
+    arch/ppc/lib/ppcstring.o   (.text)
     lib_generic/vsprintf.o     (.text)
     lib_generic/crc32.o                (.text)
     lib_generic/zlib.o         (.text)
@@ -66,17 +66,14 @@ SECTIONS
     common/env_embedded.o(.text)
 
     *(.text)
-    *(.fixup)
     *(.got1)
   }
   _etext = .;
   PROVIDE (etext = .);
   .rodata    :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.rodata.str1.4)
     *(.eh_frame)
+    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
   }
   .fini      : { *(.fini)    } =0
   .ctors     : { *(.ctors)   }
@@ -133,6 +130,7 @@ SECTIONS
    *(.dynbss)
    *(.bss)
    *(COMMON)
+   . = ALIGN(4);
   }
   _end = . ;
   PROVIDE (end = .);