From d53ae4b2067e5e7c4f5a0b9a234a89e0582c2e84 Mon Sep 17 00:00:00 2001 From: Oliver Schinagl Date: Thu, 21 Apr 2011 19:45:30 +0000 Subject: gcc 3.4.6 requirements --- uClinux-2.4.20-uc1/arch/armnommu/Makefile | 4 ++-- uClinux-2.4.20-uc1/drivers/mtd/mtdblock.c | 2 +- uClinux-2.4.20-uc1/include/asm-armnommu/proc-armv/system.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/uClinux-2.4.20-uc1/arch/armnommu/Makefile b/uClinux-2.4.20-uc1/arch/armnommu/Makefile index 355e57e..833eed2 100644 --- a/uClinux-2.4.20-uc1/arch/armnommu/Makefile +++ b/uClinux-2.4.20-uc1/arch/armnommu/Makefile @@ -64,8 +64,8 @@ endif load-y := $(call check_gcc,-mshort-load-bytes,-malignment-traps) -CFLAGS += $(apcs-y) $(arch-y) $(tune-y) $(load-y) -AFLAGS += $(apcs-y) $(proc-y) +CFLAGS += $(apcs-y) $(arch-y) $(tune-y) $(load-y) -msoft-float +AFLAGS += $(apcs-y) $(proc-y) -msoft-float LIBGCC := $(shell $(CC) $(CFLAGS) --print-libgcc-file-name) diff --git a/uClinux-2.4.20-uc1/drivers/mtd/mtdblock.c b/uClinux-2.4.20-uc1/drivers/mtd/mtdblock.c index fdea52d..d4d19c8 100644 --- a/uClinux-2.4.20-uc1/drivers/mtd/mtdblock.c +++ b/uClinux-2.4.20-uc1/drivers/mtd/mtdblock.c @@ -432,7 +432,7 @@ static void handle_mtdblock_request(void) res = 0; if (MINOR(req->rq_dev) >= MAX_MTD_DEVICES) - panic(__FUNCTION__": minor out of bound"); + panic("%s: minor out of bound", __FUNCTION__); if ((req->sector + req->current_nr_sectors) > (mtdblk->mtd->size >> 9)) goto end_req; diff --git a/uClinux-2.4.20-uc1/include/asm-armnommu/proc-armv/system.h b/uClinux-2.4.20-uc1/include/asm-armnommu/proc-armv/system.h index 77fd92b..feeb7e0 100644 --- a/uClinux-2.4.20-uc1/include/asm-armnommu/proc-armv/system.h +++ b/uClinux-2.4.20-uc1/include/asm-armnommu/proc-armv/system.h @@ -182,12 +182,12 @@ extern __inline__ unsigned long __xchg(unsigned long x, volatile void *ptr, int break; #else case 1: __asm__ __volatile__ ("swpb %0, %1, [%2]" - : "=r" (ret) + : "=&r" (ret) : "r" (x), "r" (ptr) : "memory"); break; case 4: __asm__ __volatile__ ("swp %0, %1, [%2]" - : "=r" (ret) + : "=&r" (ret) : "r" (x), "r" (ptr) : "memory"); break; -- cgit v0.12