Changeset 383ddd6 in mainline for uspace/srv/loader/arch

Timestamp:

2010-01-20T20:33:55Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

975e7e9

Parents:

6c01702 (diff), 3c081d0e (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:

uspace/srv/loader/arch

Files:

• amd64/Makefile.inc (modified) (1 diff)
• arm32/Makefile.inc (modified) (1 diff)
• ia32/Makefile.inc (modified) (1 diff)
• ia64/Makefile.inc (modified) (1 diff)
• mips32/Makefile.inc (modified) (1 diff)
• ppc32/Makefile.inc (modified) (1 diff)
• sparc64/Makefile.inc (modified) (1 diff)

uspace/srv/loader/arch/amd64/Makefile.inc

@@ -27 +27 @@
 #
 
-CFLAGS += -D__64_BITS__
+EXTRA_CFLAGS = -D__64_BITS__
 ARCH_SOURCES := arch/$(UARCH)/amd64.s

uspace/srv/loader/arch/arm32/Makefile.inc

@@ -27 +27 @@
 #
 
-CFLAGS += -D__32_BITS__
+EXTRA_CFLAGS = -D__32_BITS__
 ARCH_SOURCES := arch/$(UARCH)/arm32.s

uspace/srv/loader/arch/ia32/Makefile.inc

@@ -27 +27 @@
 #
 
-CFLAGS += -D__32_BITS__
+EXTRA_CFLAGS = -D__32_BITS__
 ARCH_SOURCES := arch/$(UARCH)/ia32.s

uspace/srv/loader/arch/ia64/Makefile.inc

@@ -27 +27 @@
 #
 
-CFLAGS += -D__64_BITS__
+EXTRA_CFLAGS = -D__64_BITS__
 ARCH_SOURCES := arch/$(UARCH)/ia64.s
 AFLAGS += -xexplicit

uspace/srv/loader/arch/mips32/Makefile.inc

@@ -27 +27 @@
 #
 
-CFLAGS += -D__32_BITS__
+EXTRA_CFLAGS = -D__32_BITS__
 ARCH_SOURCES := arch/$(UARCH)/mips32.s

uspace/srv/loader/arch/ppc32/Makefile.inc

@@ -27 +27 @@
 #
 
-CFLAGS += -D__32_BITS__
+EXTRA_CFLAGS = -D__32_BITS__
 ARCH_SOURCES := arch/$(UARCH)/ppc32.s

uspace/srv/loader/arch/sparc64/Makefile.inc

@@ -27 +27 @@
 #
 
-CFLAGS += -D__64_BITS__
+EXTRA_CFLAGS = -D__64_BITS__
 ARCH_SOURCES := arch/$(UARCH)/sparc64.s