fiasco: bootstrap: some other try to link image explicitly. address changed. adapted...

diff --git a/bootstrap-relink/all-linked-try.ld b/bootstrap-relink/all-linked-try.ld
index 83d09eced31bb22837249a422cca101080ec6f8c..949f13877e263bd9ded64c6660a60a8be16a926d 100644 (file)
--- a/bootstrap-relink/all-linked-try.ld
+++ b/bootstrap-relink/all-linked-try.ld
@@ -43,15 +43,15 @@ SECTIONS
        }
        
        /*fiasco section*/
-       . =  0x00100000 ;
+       . =  0x01000000 ;
        _image_start = .;
-       .text 0x00100000 : AT(0x00100000 - 0xf0000) 
+       .text 0x01000000 : AT(0x00100000 - 0xf0000) 
        {
        *( EXCLUDE_FILE (header-32-inmate.o) .text .text.*)
        *( EXCLUDE_FILE (header-32-inmate.o) .rodata .rodata.*)
        } =0x9090
 
-       .data : AT(0x00100000 + SIZEOF(.text) - 0xf0000)
+       .data : AT(0x01000000 + SIZEOF(.text) - 0xf0000)
        {
        *( EXCLUDE_FILE (header-32-inmate.o) .data .data.*)
        *( EXCLUDE_FILE (header-32-inmate.o) .bss .bss.*)

diff --git a/bootstrap-relink/link_objects.sh b/bootstrap-relink/link_objects.sh
index 145840754b76e95d663a0bb0f15b17dc7210234e..f9cad7145b0dea7be4d36b00ee0a0eac705c32cc 100755 (executable)
--- a/bootstrap-relink/link_objects.sh
+++ b/bootstrap-relink/link_objects.sh
@@ -8,11 +8,11 @@ set -e;
 
 echo "[bootstrap] remake..."
 START_DIR=$PWD
-cd $SNAP_DIR/obj/l4/amd64/pkg/bootstrap
+cd $SNAP_DIR/l4/pkg/bootstrap
 make
 cd $START_DIR
 
-BOOTST_OBJ_DIR=$SNAP_DIR/obj/l4/amd64/pkg/bootstrap/server/src/OBJ-amd64_K8
+BOOTST_OBJ_DIR=$SNAP_DIR/l4/pkg/bootstrap/server/src/OBJ-amd64_opteron
 
 # echo "[bootstrap] linking..."
 # cd $BOOTST_OBJ_DIR
@@ -60,7 +60,7 @@ cd ../
 JAIL_DIR=$PWD/jailhouse/inmates
 cd $START_DIR
 echo "[inmate-header] Compiling..."
-  gcc-4.8 -Wp,-MD,$BUILD_DIR/.header-32.o.d  -nostdinc \
+  gcc -Wp,-MD,$BUILD_DIR/.header-32.o.d  -nostdinc \
   -isystem /usr/lib/gcc/x86_64-linux-gnu/4.8/include   \
   -D__KERNEL__ -D__ASSEMBLY__ -m64 -DCONFIG_X86_X32_ABI \
   -DCONFIG_AS_CFI=1 -DCONFIG_AS_CFI_SIGNAL_FRAME=1 \
@@ -117,7 +117,7 @@ gcc -m32 -o $BUILD_DIR/bootstrap32.elf -nostdlib -static \
                $BOOTST_OBJ_DIR/bootstrap32.bin \
        header-32-inmate.o\
                $LD_SCRIPT32 \
-               $SNAP_DIR/obj/l4/amd64/pkg/bootstrap/server/src/ARCH-amd64/libc32/OBJ-amd64_K8/libc32.a \
+               $SNAP_DIR/l4/pkg/bootstrap/server/src/ARCH-amd64/libc32/OBJ-amd64_opteron/libc32.a \
        -lgcc
 
 chmod 755 bootstrap32.elf