Changeset 433a2aa in mainline

Timestamp:

2006-05-21T21:22:57Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f5f2c15

Parents:

6bbb1610

Message:

add missing stuff to compile

Location:

arch/ppc64/loader

Files:

• Makefile (modified) (1 diff)
• ofw.c (modified) (2 diffs)
• pack (modified) (3 diffs)

arch/ppc64/loader/Makefile

@@ -30 +30 @@
 #
 
-TARGET = ppc-linux-gnu
+TARGET = ppc64-linux-gnu
 TOOLCHAIN_DIR = /usr/local/ppc64/bin
 

arch/ppc64/loader/ofw.c

@@ -177 +177 @@
         ofw_arg_t result[3];
         
-        if (ofw_call("call-method", 4, 4, result, "translate", ofw_mmu, virt, 1) != 0) {
+        if (ofw_call("call-method", 4, 4, result, "translate", ofw_mmu, (unsigned long) virt, 1) != 0) {
                 puts("Error: MMU method translate() failed, halting.\n");
                 halt();
         }
-        return (void *) result[2];
-}
-
-
-int ofw_map(const void *phys, const void *virt, const int size, const int mode)
+        return (void *) (unsigned long) result[2];
+}
+
+
+int ofw_map(const void *phys, const void *virt, const long size, const int mode)
 {
         return ofw_call("call-method", 6, 1, NULL, "map", ofw_mmu, mode, size, virt, phys);
@@ -205 +205 @@
         map->count = 0;
         for (pos = 0; (pos < ret / sizeof(unsigned int)) && (map->count < MEMMAP_MAX_RECORDS); pos += ac + sc) {
-                void * start = (void *) buf[pos + ac - 1];
+                void * start = (void *) (unsigned long) buf[pos + ac - 1];
                 unsigned int size = buf[pos + ac + sc - 1];
                 

arch/ppc64/loader/pack

@@ -46 +46 @@
                 *(REALMODE);
                 *(.text);
+                *(.toc);
                 
+                *(.opd);
                 *(.rodata);
                 *(.rodata.*);
@@ -92 +94 @@
 #define ${MACRO}_SIZE ((unsigned long) ${MACRO}_END - (unsigned long) ${MACRO}_START)" >> "$HEADER"
         
-        "$OBJCOPY" -I binary -O elf32-powerpc -B powerpc:common --rename-section ".data=.${BASENAME}_image" "$TASK" "$OBJECT"
+        "$OBJCOPY" -I binary -O elf64-powerpc -B powerpc:common64 --rename-section ".data=.${BASENAME}_image" "$TASK" "$OBJECT"
                 
         DATA="${DATA}
@@ -102 +104 @@
 done
 
-echo '  }
+echo '}
+
+        /DISCARD/ : {
+                *(*);
+        }
 }' >> "$LINK"