Changeset f2a3e57 in mainline

Timestamp:

2012-04-10T20:02:48Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2ce8d95

Parents:

82cb6768 (diff), d76de0e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

Files:

• boot/arch/arm32/Makefile.inc (modified) (1 diff)
• kernel/arch/arm32/Makefile.inc (modified) (1 diff)
• kernel/generic/src/console/console.c (modified) (1 diff)
• uspace/lib/c/arch/arm32/Makefile.common (modified) (1 diff)
• uspace/lib/ext4/libext4_extent.c (modified) (1 diff)

boot/arch/arm32/Makefile.inc

@@ -39 +39 @@
 BITS = 32
 ENDIANESS = LE
+EXTRA_CFLAGS = -march=armv4
 
 RD_SRVS_ESSENTIAL += \

kernel/arch/arm32/Makefile.inc

@@ -33 +33 @@
 ATSIGN = %
 
-GCC_CFLAGS += -fno-zero-initialized-in-bss -mapcs-frame
+GCC_CFLAGS += -march=armv4
 
 BITS = 32

kernel/generic/src/console/console.c

@@ -57 +57 @@
 
 /** Kernel log cyclic buffer */
-static wchar_t klog[KLOG_LENGTH] __attribute__ ((aligned (PAGE_SIZE)));
+wchar_t klog[KLOG_LENGTH] __attribute__((aligned(PAGE_SIZE)));
 
 /** Kernel log initialized */

uspace/lib/c/arch/arm32/Makefile.common

@@ -28 +28 @@
 #
 
-GCC_CFLAGS += -ffixed-r9 -mtp=soft -mapcs-frame -fno-omit-frame-pointer
+GCC_CFLAGS += -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -march=armv4
 
 ENDIANESS = LE

uspace/lib/ext4/libext4_extent.c

@@ -641 +641 @@
         }
 
-        assert(false);
-
         // start splitting
         uint32_t fblock = 0;