diff options
| author | Oliver Schinagl <oliver@schinagl.nl> | 2011-04-21 19:45:30 (GMT) |
|---|---|---|
| committer | Oliver Schinagl <oliver@schinagl.nl> | 2011-04-21 19:45:30 (GMT) |
| commit | d53ae4b2067e5e7c4f5a0b9a234a89e0582c2e84 (patch) | |
| tree | 0feee07c0a043065d54383ca019e960e93e06f78 | |
| parent | a9697885d7d80894c454cfbe69adbcba1088c84b (diff) | |
| download | openipcam-d53ae4b2067e5e7c4f5a0b9a234a89e0582c2e84.zip openipcam-d53ae4b2067e5e7c4f5a0b9a234a89e0582c2e84.tar.gz openipcam-d53ae4b2067e5e7c4f5a0b9a234a89e0582c2e84.tar.bz2 | |
gcc 3.4.6 requirements
| -rw-r--r-- | uClinux-2.4.20-uc1/arch/armnommu/Makefile | 4 | ||||
| -rw-r--r-- | uClinux-2.4.20-uc1/drivers/mtd/mtdblock.c | 2 | ||||
| -rw-r--r-- | 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; |