Changeset 473e693 in mainline

Timestamp:

2007-06-05T13:58:00Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

92d349c8

Parents:

48d14222

Message:

More suncc fixes.

• Removed extra semicolons after function declaration.
• Sun Studio recognizes only C99 func and no gcc-specific FUNCTION. In this case, a simple -D option can fix the problem.

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• arch/amd64/include/asm.h (modified) (1 diff)

kernel/Makefile

@@ -39 +39 @@
 DEFS = -D$(ARCH) -DARCH=\"$(ARCH)\" -DRELEASE=\"$(RELEASE)\" "-DNAME=\"$(NAME)\"" -DKERNEL
 CFLAGS = -fno-builtin -fomit-frame-pointer -Wall -Wmissing-prototypes -Werror -O3 -nostdlib -nostdinc -Igeneric/include/
-#SUNCC_CFLAGS = -xO3 -Igeneric/include/ -xnolib -xc99=all
+#SUNCC_CFLAGS = -xO3 -Igeneric/include/ -xnolib -xc99=all -D__FUNCTION__=__func__
 LFLAGS = -M
 AFLAGS =

kernel/arch/amd64/include/asm.h

@@ -261 +261 @@
     }
 
-GEN_READ_REG(cr0);
-GEN_READ_REG(cr2);
-GEN_READ_REG(cr3);
-GEN_WRITE_REG(cr3);
-
-GEN_READ_REG(dr0);
-GEN_READ_REG(dr1);
-GEN_READ_REG(dr2);
-GEN_READ_REG(dr3);
-GEN_READ_REG(dr6);
-GEN_READ_REG(dr7);
-
-GEN_WRITE_REG(dr0);
-GEN_WRITE_REG(dr1);
-GEN_WRITE_REG(dr2);
-GEN_WRITE_REG(dr3);
-GEN_WRITE_REG(dr6);
-GEN_WRITE_REG(dr7);
+GEN_READ_REG(cr0)
+GEN_READ_REG(cr2)
+GEN_READ_REG(cr3)
+GEN_WRITE_REG(cr3)
+
+GEN_READ_REG(dr0)
+GEN_READ_REG(dr1)
+GEN_READ_REG(dr2)
+GEN_READ_REG(dr3)
+GEN_READ_REG(dr6)
+GEN_READ_REG(dr7)
+
+GEN_WRITE_REG(dr0)
+GEN_WRITE_REG(dr1)
+GEN_WRITE_REG(dr2)
+GEN_WRITE_REG(dr3)
+GEN_WRITE_REG(dr6)
+GEN_WRITE_REG(dr7)
 
 extern size_t interrupt_handler_size;