Changeset d767cb1 in mainline for uspace

Timestamp:

2011-08-19T11:59:50Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7beb220

Parents:

c2cf033 (diff), ac7f81d (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 i486 support from Martin Sucha.

Location:

uspace/lib/c/arch/ia32

Files:

• Makefile.common (modified) (1 diff)
• Makefile.inc (modified) (1 diff)
• src/entry.S (moved) (moved from uspace/lib/c/arch/ia32/src/entry.s ) (2 diffs)

uspace/lib/c/arch/ia32/Makefile.common

@@ -28 +28 @@
 
 CLANG_ARCH = i386
+ifeq ($(PROCESSOR),i486)
+GCC_CFLAGS += -march=i486 -fno-omit-frame-pointer
+else
 GCC_CFLAGS += -march=pentium -fno-omit-frame-pointer
+endif
 
 ENDIANESS = LE

uspace/lib/c/arch/ia32/Makefile.inc

@@ -28 +28 @@
 
 ARCH_SOURCES = \
-        arch/$(UARCH)/src/entry.s \
+        arch/$(UARCH)/src/entry.S \
         arch/$(UARCH)/src/entryjmp.s \
         arch/$(UARCH)/src/thread_entry.s \

uspace/lib/c/arch/ia32/src/entry.S

@@ -46 +46 @@
         mov %ax, %fs
         # Do not set %gs, it contains descriptor that can see TLS
-        
+
+#ifndef PROCESSOR_i486  
         # Detect the mechanism used for making syscalls
         movl $(INTEL_CPUID_STANDARD), %eax
@@ -55 +56 @@
         movl $__syscall_fast, (%eax)
 0:
+#endif
         #
         # Create the first stack frame.