Changeset 60133d0 in mainline

Timestamp:

2007-05-31T23:30:32Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ff3a34b

Parents:

1e847fb

Message:

First fixes for suncc support.
It is going to be a long way…

Location:

kernel

Files:

• Makefile (modified) (6 diffs)
• arch/ia32/include/asm.h (modified) (2 diffs)
• generic/include/mm/slab.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
 LFLAGS = -M
 AFLAGS =
@@ -121 +122 @@
 ifeq ($(COMPILER),gcc_native)
         CC = gcc
+        AS_CC = gcc
         AS = as
         LD = ld
@@ -130 +132 @@
 ifeq ($(COMPILER),icc_native)
         CC = icc
+        AS_CC = gcc
         AS = as
         LD = ld
@@ -139 +142 @@
 ifeq ($(COMPILER),suncc_native)
         CC = suncc
+        AS_CC = gcc
         AS = as
         LD = ld
@@ -148 +152 @@
 ifeq ($(COMPILER),gcc_cross)
         CC = $(TOOLCHAIN_DIR)/bin/$(TARGET)-gcc
+        AS_CC = $(CC)
         AS = $(TOOLCHAIN_DIR)/bin/$(TARGET)-as
         LD = $(TOOLCHAIN_DIR)/bin/$(TARGET)-ld
@@ -332 +337 @@
 
 %.o: %.S
-        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
+        $(AS_CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
 
 %.o: %.s

kernel/arch/ia32/include/asm.h

@@ -61 +61 @@
 {
         asm volatile ("hlt\n");
-};
+}
 
 static inline void cpu_sleep(void)
 {
         asm volatile ("hlt\n");
-};
+}
 
 #define GEN_READ_REG(reg) static inline unative_t read_ ##reg (void) \
@@ -80 +80 @@
     }
 
-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)
 
 /** Byte to port

kernel/generic/include/mm/slab.h

@@ -72 +72 @@
 typedef struct {
         link_t link;
-        count_t busy;  /**< Count of full slots in magazine */
-        count_t size;  /**< Number of slots in magazine */
-        void *objs[0]; /**< Slots in magazine */
+        count_t busy;   /**< Count of full slots in magazine */
+        count_t size;   /**< Number of slots in magazine */
+        void *objs[];   /**< Slots in magazine */
 } slab_magazine_t;