diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-13 09:59:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-13 09:59:32 -0700 |
| commit | c931488cc4619eecfe68a2f046b5898fddc2f904 (patch) | |
| tree | b92e43b7cbae6e7128ca6d7831d06e63989f2a31 /arch/arm/Makefile | |
| parent | aac372de6bde03168b833b4db1346a2c34a016c6 (diff) | |
| parent | 3a8f675c40ba2d04e4fff6710db3da763436269f (diff) | |
| download | linux-c931488cc4619eecfe68a2f046b5898fddc2f904.tar.gz linux-c931488cc4619eecfe68a2f046b5898fddc2f904.tar.bz2 linux-c931488cc4619eecfe68a2f046b5898fddc2f904.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 7779f2d1acad..299bc0468702 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -53,7 +53,7 @@ tune-$(CONFIG_CPU_ARM926T) :=-mtune=arm9tdmi tune-$(CONFIG_CPU_SA110) :=-mtune=strongarm110 tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100 tune-$(CONFIG_CPU_XSCALE) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale -tune-$(CONFIG_CPU_V6) :=-mtune=strongarm +tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) # Need -Uarm for gcc < 3.x CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,) |