Changeset e2b73d4f in mainline for kernel/arch/ia32

Timestamp:

2010-03-21T09:25:29Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

19f857a

Parents:

facebd56 (diff), 4e9aaf5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/arch/ia32

Files:

• Makefile.inc (modified) (2 diffs)
• include/types.h (modified) (2 diffs)

kernel/arch/ia32/Makefile.inc

@@ -27 +27 @@
 #
 
-## Toolchain configuration
-#
-
 BFD_NAME = elf32-i386
 BFD_ARCH = i386
 BFD = binary
-TARGET = i686-pc-linux-gnu
 CLANG_ARCH = i386
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia32
 
 BITS = 32
@@ -53 +48 @@
         SUNCC_CFLAGS += -xarch=ssea
 endif
+
 ifeq ($(PROCESSOR),athlon_mp)
         CMN2 = -march=athlon-mp
         SUNCC_CFLAGS += xarch=ssea
 endif
+
 ifeq ($(PROCESSOR),pentium3)
         CMN2 = -march=pentium3
         SUNCC_CFLAGS += -xarch=sse
 endif
+
 ifeq ($(PROCESSOR),pentium4)
         CMN2 = -march=pentium4
         SUNCC_CFLAGS += -xarch=sse2
 endif
+
 ifeq ($(PROCESSOR),core)
         CMN2 = -march=prescott

kernel/arch/ia32/include/types.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -36 +36 @@
 #define KERN_ia32_TYPES_H_
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed long int32_t;
-typedef signed long long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned long uint32_t;
-typedef unsigned long long uint64_t;
+#include <arch/common.h>
 
 typedef uint32_t size_t;