Changeset 941d1e9 in mainline for arch

Timestamp:

2005-09-29T22:47:42Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

922c7ce

Parents:

40a468a

Message:

Make cross-compiler the default compiler on IA-32.
For native compilations, use ./build.ia32 native.

Small changes elsewhere.

Location:

arch/ia32

Files:

• Makefile.inc (modified) (2 diffs)
• _link.ld.in (modified) (3 diffs)
• src/asm.S (modified) (1 diff)

arch/ia32/Makefile.inc

@@ -1 @@
-ifeq (${CROSS_COMPILER},yes)
+ifeq (${NATIVE_COMPILER},yes)
+        CC=gcc
+        AS=as
+        LD=ld
+        OBJCOPY=objcopy
+        OBJDUMP=objdump
+else
         IA-32_TARGET=i686-pc-linux-gnu
 
@@ -10 +16 @@
         OBJCOPY=$(IA-32_BINUTILS_DIR)/$(IA-32_TARGET)-objcopy
         OBJDUMP=$(IA-32_BINUTILS_DIR)/$(IA-32_TARGET)-objdump
-else
-        CC=gcc
-        AS=as
-        LD=ld
-        OBJCOPY=objcopy
-        OBJDUMP=objdump
 endif
 

arch/ia32/_link.ld.in

@@ -22 +22 @@
                 *(K_TEXT_START_2);
                 unmapped_ktext_end = .;
-                
+        
                 unmapped_kdata_start = .;
                 *(K_DATA_START);
-                LONG(0xdeadbeaf);               /* TODO: remove 0xdeadbeaf */
                 unmapped_kdata_end = .;
+                
+                LONG(0xdeadbeaf);               /* TODO: remove 0xdeadbeaf */                                           
         }
         
@@ -50 +51 @@
                 LONG(unmapped_kdata_end - unmapped_kdata_start);
                 *(.bss);                        /* uninitialized static variables */
-                *(.note.GNU-stack);
-                *(.comment);
-
                 symbol_table = .;
                 *(symtab.*);                    /* Symbol table, must be LAST symbol! */
@@ -58 +56 @@
                 kdata_end = .;
         }
+
+        /DISCARD/ : {
+                *(.note.GNU-stack);             
+                *(.comment);
+        }
+
         
         _hardcoded_kernel_size = (ktext_end - ktext_start) + (unmapped_ktext_end - unmapped_ktext_start) + (kdata_end - kdata_start) + (unmapped_kdata_end - unmapped_kdata_start);

arch/ia32/src/asm.S

@@ -207 +207 @@
 # Compare a given number of bytes (3rd argument)
 # at memory locations defined by 1st and 2nd argument
-# for equality. If the bytes are equal, EAX contains
-# 0.
+# for equality. If the bytes are equal, EAX contains 0.
 #
 SRC=12