Changeset 6ab8697 in mainline for kernel

Timestamp:

2009-10-07T14:03:35Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2088dfc

Parents:

7a53208

Message:

use builtin_va_* for va_* functions and va_list type
(this is probably safer than our own implementation since it respects the particular ABI used by the compiler)
this fixes kernel printf() when using clang

Location:

kernel

Files:

• Makefile (modified) (2 diffs)
• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/amd64/include/arg.h (deleted)
• arch/arm32/include/arg.h (deleted)
• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia32/include/arg.h (deleted)
• arch/ia64/include/arg.h (deleted)
• arch/mips32/include/arg.h (deleted)
• arch/ppc32/include/arg.h (deleted)
• arch/sparc64/include/arg.h (deleted)
• generic/include/print.h (modified) (1 diff)
• generic/include/printf/printf_core.h (modified) (1 diff)
• generic/include/stackarg.h (deleted)
• generic/include/stdarg.h (modified) (3 diffs)
• generic/src/printf/printf_core.c (modified) (1 diff)

kernel/Makefile

@@ -49 +49 @@
 GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
-        -finput-charset=UTF-8 -fno-builtin -Wall -Wextra -Wno-unused-parameter \
-        -Wmissing-prototypes -Werror -nostdlib -nostdinc -pipe
+        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
+        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -Werror \
+        -pipe
 
 ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
-        -fno-builtin -Wall -Wmissing-prototypes -Werror \
-        -nostdlib -nostdinc -wd170
+        -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
+        -Werror -wd170
 
 SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
@@ -62 +63 @@
 CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
-        -finput-charset=UTF-8 -fno-builtin -Wall -Wextra -Wno-unused-parameter \
-        -Wmissing-prototypes -nostdlib -nostdinc -pipe
+        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
+        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -pipe \
+        -arch $(CLANG_ARCH)
 
 LFLAGS = -M

kernel/arch/amd64/Makefile.inc

@@ -34 +34 @@
 BFD = binary
 TARGET = amd64-linux-gnu
+CLANG_ARCH = x86_64
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/amd64
 

kernel/arch/ia32/Makefile.inc

@@ -34 +34 @@
 BFD = binary
 TARGET = i686-pc-linux-gnu
+CLANG_ARCH = i386
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia32
 

kernel/generic/include/print.h

@@ -37 +37 @@
 
 #include <arch/types.h>
-#include <arch/arg.h>
+#include <stdarg.h>
 
 #define EOF (-1)

kernel/generic/include/printf/printf_core.h

@@ -37 +37 @@
 
 #include <typedefs.h>
-#include <arch/arg.h>
+#include <stdarg.h>
 
 /** Structure for specifying output methods for different printf clones. */

kernel/generic/include/stdarg.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -37 +37 @@
  * for all architectures with compiler support for __builtin_va_*.
  */
- 
+
 #ifndef KERN_STDARG_H_
 #define KERN_STDARG_H_
@@ -43 +43 @@
 typedef __builtin_va_list va_list;
 
-#define va_start(ap, last)              __builtin_va_start(ap, last)
-#define va_arg(ap, type)                __builtin_va_arg(ap, type)
-#define va_end(ap)                      __builtin_va_end(ap)
-#define va_copy(dst, src)               __builtin_va_copy(dst, src)
+#define va_start(ap, last)  __builtin_va_start(ap, last)
+#define va_arg(ap, type)    __builtin_va_arg(ap, type)
+#define va_end(ap)          __builtin_va_end(ap)
+#define va_copy(dst, src)   __builtin_va_copy(dst, src)
 
 #endif

kernel/generic/src/printf/printf_core.c

@@ -39 +39 @@
 #include <printf/printf_core.h>
 #include <print.h>
-#include <arch/arg.h>
+#include <stdarg.h>
 #include <macros.h>
 #include <string.h>