Changeset 92d349c8 in mainline

Timestamp:

2007-06-05T15:31:30Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

52d30c4

Parents:

473e693

Message:

More suncc fixes.

• remove more empty declarations
• add options to turn errors on empty structs into warnings and options to silence these warnings

Location:

kernel

Files:

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

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 -D__FUNCTION__=__func__
+
+#SUNCC_CFLAGS = -xO3 -Igeneric/include/ -xnolib -xc99=all \
+#-D__FUNCTION__=__func__ -features=extensions \
+#-erroff=E_ZERO_SIZED_STRUCT_UNION
+
 LFLAGS = -M
 AFLAGS =

kernel/arch/amd64/include/asm.h

@@ -59 +59 @@
 {
         asm volatile ("hlt\n");
-};
+}
 
 static inline void cpu_halt(void)
 {
         asm volatile ("hlt\n");
-};
+}
 
 
@@ -74 +74 @@
  * @return Value read
  */
-static inline uint8_t inb(uint16_t port) { uint8_t val; __asm__ volatile ("inb %w1, %b0 \n" : "=a" (val) : "d" (port) ); return val; }
+static inline uint8_t inb(uint16_t port)
+{
+        uint8_t val;
+
+        asm volatile ("inb %w1, %b0 \n" : "=a" (val) : "d" (port));
+        return val;
+}
 
 /** Byte to port
@@ -83 +89 @@
  * @param val Value to write
  */
-static inline void outb(uint16_t port, uint8_t val) { __asm__ volatile ("outb %b0, %w1\n" : : "a" (val), "d" (port) ); }
+static inline void outb(uint16_t port, uint8_t val)
+{
+        asm volatile ("outb %b0, %w1\n" : : "a" (val), "d" (port));
+}
 
 /** Swap Hidden part of GS register with visible one */
-static inline void swapgs(void) { __asm__ volatile("swapgs"); }
+static inline void swapgs(void)
+{
+        asm volatile("swapgs");
+}
 
 /** Enable interrupts.