Changeset bda24ee7 in mainline

Timestamp:

2009-01-13T20:26:00Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

6cd3e8a

Parents:

42ec919

Message:

Fix mips32 userspace atomic_add() the same way as the kernel one. This problem prevented building at lower optimization levels.

Location:

uspace/lib/libc

Files:

• Makefile.toolchain (modified) (1 diff)
• arch/mips32/include/atomic.h (modified) (1 diff)

uspace/lib/libc/Makefile.toolchain

@@ -28 +28 @@
 
 DEFS = -DARCH=$(ARCH)
-CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include -pipe
+CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -I$(LIBC_PREFIX)/include -pipe -g
 LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS =

uspace/lib/libc/arch/mips32/include/atomic.h

@@ -60 +60 @@
                 "1:\n"
                 "       ll %0, %1\n"
-                "       addiu %0, %0, %3\n"     /* same as addi, but never traps on overflow */
+                "       addu %0, %0, %3\n"      /* same as add, but never traps on overflow */
                 "       move %2, %0\n"
                 "       sc %0, %1\n"
                 "       beq %0, %4, 1b\n"       /* if the atomic operation failed, try again */
                 /*      nop     */              /* nop is inserted automatically by compiler */
+                "       nop\n"
                 : "=&r" (tmp), "+m" (val->count), "=&r" (v)
-                : "i" (i), "i" (0)
+                : "r" (i), "i" (0)
                 );