diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
| commit | acc696d93dcf993dec123d69d599979e1456ffec (patch) | |
| tree | b860b80bb96bb5e3ea1f0347b92fbb1e8b15af36 /arch/arm/Makefile | |
| parent | bf2af2a2027e52b653882fbca840620e896ae081 (diff) | |
| parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) | |
Merge branch 'master' into upstream
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 95a96275f88a..6f8e84c1c1f2 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -66,7 +66,7 @@ tune-$(CONFIG_CPU_XSC3) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) - | |||
| 66 | tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) | 66 | tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) |
| 67 | 67 | ||
| 68 | ifeq ($(CONFIG_AEABI),y) | 68 | ifeq ($(CONFIG_AEABI),y) |
| 69 | CFLAGS_ABI :=-mabi=aapcs -mno-thumb-interwork | 69 | CFLAGS_ABI :=-mabi=aapcs-linux -mno-thumb-interwork |
| 70 | else | 70 | else |
| 71 | CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,) | 71 | CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,) |
| 72 | endif | 72 | endif |