From f0b033771cd04eef723e28b6d48434cdd9b0b99e Mon Sep 17 00:00:00 2001 From: Bernard Davison Date: Thu, 3 Feb 2011 08:23:39 +1100 Subject: [PATCH] the cross compiler for tiny and lisa now works what we believe is 'properly' --- .../cross/arm-none-eabi-gcc-linaro/Portfile | 2 +- .../files/patch-gcc-config-arm-t-arm-elf.diff | 299 +++++++++++++++--- darwin/macports/ports/cross/libcmsis/Portfile | 3 +- .../libcmsis/files/patch-src-Makefile.diff | 2 +- .../ports/cross/libopenstm32/Portfile | 6 - .../libopenstm32/files/patch-Makefile.diff | 11 - ...tch-examples-lpc13xx-Makefile-include.diff | 11 - ...patch-examples-stm32-Makefile-include.diff | 11 - .../files/patch-lib-lpc13cc-Makefile.diff | 11 - .../files/patch-lib-stm32-Makefile.diff | 11 - .../libstm32/files/patch-src-Makefile.diff | 2 +- .../macports/ports/cross/libstm32usb/Portfile | 2 - .../libstm32usb/files/patch-src-Makefile.diff | 2 +- 13 files changed, 267 insertions(+), 106 deletions(-) delete mode 100644 darwin/macports/ports/cross/libopenstm32/files/patch-Makefile.diff delete mode 100644 darwin/macports/ports/cross/libopenstm32/files/patch-examples-lpc13xx-Makefile-include.diff delete mode 100644 darwin/macports/ports/cross/libopenstm32/files/patch-examples-stm32-Makefile-include.diff delete mode 100644 darwin/macports/ports/cross/libopenstm32/files/patch-lib-lpc13cc-Makefile.diff delete mode 100644 darwin/macports/ports/cross/libopenstm32/files/patch-lib-stm32-Makefile.diff diff --git a/darwin/macports/ports/cross/arm-none-eabi-gcc-linaro/Portfile b/darwin/macports/ports/cross/arm-none-eabi-gcc-linaro/Portfile index 7406fcb..d0f3371 100644 --- a/darwin/macports/ports/cross/arm-none-eabi-gcc-linaro/Portfile +++ b/darwin/macports/ports/cross/arm-none-eabi-gcc-linaro/Portfile @@ -76,7 +76,7 @@ configure.cc gcc configure.cxx g++ configure.cppflags configure.ldflags -#configure.cc-append -I${prefix}/include +configure.cc-append -I${prefix}/include configure.args --target=${targetarch} \ --program-prefix=${targetarch}- \ --enable-interwork \ diff --git a/darwin/macports/ports/cross/arm-none-eabi-gcc-linaro/files/patch-gcc-config-arm-t-arm-elf.diff b/darwin/macports/ports/cross/arm-none-eabi-gcc-linaro/files/patch-gcc-config-arm-t-arm-elf.diff index a73005f..96777e2 100644 --- a/darwin/macports/ports/cross/arm-none-eabi-gcc-linaro/files/patch-gcc-config-arm-t-arm-elf.diff +++ b/darwin/macports/ports/cross/arm-none-eabi-gcc-linaro/files/patch-gcc-config-arm-t-arm-elf.diff @@ -1,32 +1,268 @@ ---- gcc/config/arm/t-arm-elf.orig 2011-02-02 20:23:22.000000000 +1100 -+++ gcc/config/arm/t-arm-elf 2011-02-02 20:39:43.000000000 +1100 -@@ -36,30 +36,34 @@ +--- gcc/config/arm/t-arm-elf.orig 2011-02-03 03:01:34.000000000 +1100 ++++ gcc/config/arm/t-arm-elf 2011-02-03 03:04:34.000000000 +1100 +@@ -31,10 +31,259 @@ + _arm_floatdidf _arm_floatdisf _arm_floatundidf _arm_floatundisf \ + _clzsi2 _clzdi2 + +-MULTILIB_OPTIONS = marm/mthumb +-MULTILIB_DIRNAMES = arm thumb ++# We build 4 multilibs: ++# ./ (default) ++# thumb/ -mthumb ++# thumb2/ -mthumb -march=armv7 ++# armv6-m/ -mthumb -march=armv6-m ++ ++MULTILIB_OPTIONS = mthumb ++MULTILIB_DIRNAMES = thumb ++MULTILIB_EXCEPTIONS = ++MULTILIB_MATCHES = ++MULTILIB_ALIASES = ++ ++MULTILIB_OPTIONS += march=armv7/march=armv6-m ++MULTILIB_DIRNAMES += v7 v6-m ++MULTILIB_EXCEPTIONS += march=armv7* ++MULTILIB_MATCHES += march?armv7=march?armv7-a ++MULTILIB_MATCHES += march?armv7=march?armv7-r ++MULTILIB_MATCHES += march?armv7=march?armv7-m ++MULTILIB_MATCHES += march?armv7=march?armv7e-m ++MULTILIB_MATCHES += march?armv7=mcpu?cortex-a9 ++MULTILIB_MATCHES += march?armv7=mcpu?cortex-a8 ++MULTILIB_MATCHES += march?armv7=mcpu?cortex-a5 ++MULTILIB_MATCHES += march?armv7=mcpu?cortex-r4 ++MULTILIB_MATCHES += march?armv7=mcpu?cortex-r4f ++MULTILIB_MATCHES += march?armv7=mcpu?cortex-m4 ++MULTILIB_MATCHES += march?armv7=mcpu?cortex-m3 ++ ++MULTILIB_EXCEPTIONS += march=armv6-m ++MULTILIB_MATCHES += march?armv6-m=mcpu?cortex-m1 ++MULTILIB_MATCHES += march?armv6-m=mcpu?cortex-m0 ++ ++# FIXME: We need a sane way of doing this. ++# This isn't really a multilib, it's a hack to add an extra option ++# to the v7-m multilib. ++MULTILIB_OPTIONS += mfix-cortex-m3-ldrd ++MULTILIB_DIRNAMES += broken_ldrd ++ ++MULTILIB_EXCEPTIONS += mfix-cortex-m3-ldrd ++MULTILIB_EXCEPTIONS += mthumb/mfix-cortex-m3-ldrd ++MULTILIB_EXCEPTIONS += *march=armv6-m*mfix-cortex-m3-ldrd ++ ++MULTILIB_ALIASES += mthumb/march?armv7/mfix-cortex-m3-ldrd=mthumb/march?armv7 ++ ++# As of at least 4.2, gcc passes the wrong -L options if some multilibs are ++# omitted from MULTILIB_OSDIRNAMES ++MULTILIB_OSDIRNAMES = mthumb=!thumb ++MULTILIB_OSDIRNAMES += mthumb/march.armv7/mfix-cortex-m3-ldrd=!thumb2 ++MULTILIB_OSDIRNAMES += mthumb/march.armv6-m=!armv6-m ++ ++# Multilibs for SourceryG++ arm-none-eabi ++ ++MULTILIB_OPTIONS = mthumb ++MULTILIB_DIRNAMES = t MULTILIB_EXCEPTIONS = MULTILIB_MATCHES = ++MULTILIB_ALIASES = ++ ++MULTILIB_OPTIONS += march=armv7/march=armv7-a/march=armv5te/march=armv6-m ++MULTILIB_DIRNAMES += v7 v7a v5te v6m ++MULTILIB_MATCHES += march?armv7-a=march?armv7a ++MULTILIB_MATCHES += march?armv7=march?armv7r ++MULTILIB_MATCHES += march?armv7=march?armv7m ++MULTILIB_MATCHES += march?armv7=march?armv7-r ++MULTILIB_MATCHES += march?armv7=march?armv7-m ++MULTILIB_MATCHES += march?armv7=march?armv7e-m ++MULTILIB_MATCHES += march?armv7-a=mcpu?cortex-a9 ++MULTILIB_MATCHES += march?armv7-a=mcpu?cortex-a8 ++MULTILIB_MATCHES += march?armv7-a=mcpu?cortex-a5 ++MULTILIB_MATCHES += march?armv7=mcpu?cortex-r4 ++MULTILIB_MATCHES += march?armv7=mcpu?cortex-r4f ++MULTILIB_MATCHES += march?armv7=mcpu?cortex-m4 ++MULTILIB_MATCHES += march?armv7=mcpu?cortex-m3 ++MULTILIB_MATCHES += march?armv6-m=mcpu?cortex-m1 ++MULTILIB_MATCHES += march?armv6-m=mcpu?cortex-m0 ++MULTILIB_MATCHES += march?armv5te=march?armv6 ++MULTILIB_MATCHES += march?armv5te=march?armv6j ++MULTILIB_MATCHES += march?armv5te=march?armv6k ++MULTILIB_MATCHES += march?armv5te=march?armv6z ++MULTILIB_MATCHES += march?armv5te=march?armv6zk ++MULTILIB_MATCHES += march?armv5te=march?armv6t2 ++MULTILIB_MATCHES += march?armv5te=march?iwmmxt ++MULTILIB_MATCHES += march?armv5te=march?iwmmxt2 ++MULTILIB_MATCHES += march?armv5te=mcpu?arm9e ++MULTILIB_MATCHES += march?armv5te=mcpu?arm946e-s ++MULTILIB_MATCHES += march?armv5te=mcpu?arm966e-s ++MULTILIB_MATCHES += march?armv5te=mcpu?arm968e-s ++MULTILIB_MATCHES += march?armv5te=mcpu?arm10e ++MULTILIB_MATCHES += march?armv5te=mcpu?arm1020e ++MULTILIB_MATCHES += march?armv5te=mcpu?arm1022e ++MULTILIB_MATCHES += march?armv5te=mcpu?xscale ++MULTILIB_MATCHES += march?armv5te=mcpu?iwmmxt ++MULTILIB_MATCHES += march?armv5te=mcpu?iwmmxt2 ++MULTILIB_MATCHES += march?armv5te=mcpu?marvell-f ++MULTILIB_MATCHES += march?armv5te=mcpu?arm926ej-s ++MULTILIB_MATCHES += march?armv5te=mcpu?arm1026ej-s ++MULTILIB_MATCHES += march?armv5te=mcpu?arm1136j-s ++MULTILIB_MATCHES += march?armv5te=mcpu?arm1136jf-s ++MULTILIB_MATCHES += march?armv5te=mcpu?arm1176jz-s ++MULTILIB_MATCHES += march?armv5te=mcpu?arm1176jzf-s ++MULTILIB_MATCHES += march?armv5te=mcpu?mpcorenovfp ++MULTILIB_MATCHES += march?armv5te=mcpu?mpcore ++MULTILIB_MATCHES += march?armv5te=mcpu?arm1156t2-s ++ ++MULTILIB_OPTIONS += mfloat-abi=softfp/mfloat-abi=hard ++MULTILIB_DIRNAMES += softfp hard ++MULTILIB_MATCHES += mfloat-abi?hard=mhard-float ++ ++MULTILIB_OPTIONS += mfpu=neon ++MULTILIB_DIRNAMES += neon ++MULTILIB_EXCEPTIONS += mfpu=neon ++MULTILIB_MATCHES += mfpu?neon=mfpu?neon-fp16 ++MULTILIB_MATCHES += mfpu?neon=mfpu?neon-vfpv4 ++ ++MULTILIB_ALIASES += mthumb=mthumb/mfpu?neon ++MULTILIB_ALIASES += mthumb=mthumb/march?armv5te/mfpu?neon ++MULTILIB_ALIASES += mbig-endian=mthumb/mfpu?neon/mbig-endian ++#MULTILIB_ALIASES += mfloat-abi?softfp=mthumb/mfloat-abi?softfp/mfpu?neon ++#MULTILIB_ALIASES += mfloat-abi?softfp=mfloat-abi?softfp/mfpu?neon ++#MULTILIB_ALIASES += mfloat-abi?softfp/mbig-endian=mfloat-abi?softfp/mfpu?neon/mbig-endian ++#MULTILIB_ALIASES += mfloat-abi?softfp/mbig-endian=mthumb/mfloat-abi?softfp/mfpu?neon/mbig-endian ++MULTILIB_ALIASES += mthumb/march?armv7/mfix-cortex-m3-ldrd=mthumb/march?armv7-a/mfpu?neon ++MULTILIB_ALIASES += mthumb/march?armv7/mbig-endian=mthumb/march?armv7-a/mfpu?neon/mbig-endian ++MULTILIB_ALIASES += march?armv7-a/mfloat-abi?softfp/mfpu?neon=mthumb/march?armv7-a/mfloat-abi?softfp/mfpu?neon ++MULTILIB_ALIASES += march?armv7-a/mfloat-abi?hard/mfpu?neon=mthumb/march?armv7-a/mfloat-abi?hard/mfpu?neon ++ ++MULTILIB_OPTIONS += mbig-endian ++MULTILIB_DIRNAMES += be ++MULTILIB_ALIASES += mbig-endian=mfpu?neon/mbig-endian ++ ++# ARMv6-M does not have ARM mode. ++MULTILIB_EXCEPTIONS += march=armv6-m ++ ++# Some ARMv7 variants have ARM mode. Use the ARM libraries. ++MULTILIB_EXCEPTIONS += march=armv7 march=armv7/* ++MULTILIB_ALIASES += mbig-endian=march?armv7/mbig-endian ++MULTILIB_ALIASES += march?armv5te/mfloat-abi?softfp=march?armv7/mfloat-abi?softfp ++MULTILIB_ALIASES += march?armv5te/mfloat-abi?softfp=march?armv7/mfloat-abi?softfp/mfpu?neon ++MULTILIB_ALIASES += march?armv5te/mfloat-abi?softfp/mbig-endian=march?armv7/mfloat-abi?softfp/mbig-endian ++MULTILIB_ALIASES += march?armv5te/mfloat-abi?softfp/mbig-endian=march?armv7/mfloat-abi?softfp/mfpu?neon/mbig-endian ++MULTILIB_ALIASES += mbig-endian=march?armv7/mfpu?neon/mbig-endian ++MULTILIB_ALIASES += mthumb/march?armv7/mfix-cortex-m3-ldrd=mthumb/march?armv7/mfloat-abi?softfp/mfpu?neon ++MULTILIB_ALIASES += mthumb/march?armv7/mfix-cortex-m3-ldrd=mthumb/march?armv7/mfpu?neon ++MULTILIB_ALIASES += mthumb/march?armv7/mbig-endian=mthumb/march?armv7/mfpu?neon/mbig-endian ++MULTILIB_ALIASES += mthumb/march?armv7/mbig-endian=mthumb/march?armv7/mfloat-abi?softfp/mfpu?neon/mbig-endian ++ ++# ARMv7-A is specially useful used with VFPv3 (enabled by NEON). Rest of the cases behaves as ARMv7. ++MULTILIB_ALIASES += mthumb/march?armv7/mfix-cortex-m3-ldrd=mthumb/march?armv7-a ++MULTILIB_ALIASES += mbig-endian=march?armv7-a/mbig-endian ++MULTILIB_ALIASES += march?armv5te/mfloat-abi?softfp/mbig-endian=march?armv7-a/mfloat-abi?softfp/mbig-endian ++MULTILIB_ALIASES += march?armv5te/mfloat-abi?softfp/mbig-endian=march?armv7-a/mfloat-abi?softfp/mfpu?neon/mbig-endian ++MULTILIB_ALIASES += mthumb/march?armv7/mfix-cortex-m3-ldrd=mthumb/march?armv7-a/mfloat-abi?softfp ++MULTILIB_ALIASES += mthumb/march?armv7/mbig-endian=mthumb/march?armv7-a/mbig-endian ++MULTILIB_ALIASES += mthumb/march?armv7/mbig-endian=mthumb/march?armv7-a/mfloat-abi?softfp/mbig-endian ++MULTILIB_ALIASES += mthumb/march?armv7/mfix-cortex-m3-ldrd=mthumb/march?armv7/mfloat-abi?softfp ++MULTILIB_ALIASES += march?armv5te=march?armv7-a ++MULTILIB_ALIASES += march?armv5te/mfloat-abi?softfp=march?armv7-a/mfloat-abi?softfp ++MULTILIB_ALIASES += march?armv5te=march?armv7-a/mfpu?neon ++MULTILIB_ALIASES += mbig-endian=march?armv7-a/mfpu?neon/mbig-endian ++MULTILIB_ALIASES += mthumb/march?armv7/mbig-endian=mthumb/march?armv7-a/mfloat-abi?softfp/mfpu?neon/mbig-endian ++ ++# ARMv5T thumb uses the ARMv5T ARM libraries (with or without VFP). ++MULTILIB_ALIASES += mthumb=mthumb/march?armv5te ++MULTILIB_ALIASES += march?armv5te/mfloat-abi?softfp=mthumb/march?armv5te/mfloat-abi?softfp ++MULTILIB_ALIASES += march?armv5te/mfloat-abi?softfp=march?armv5te/mfloat-abi?softfp/mfpu?neon ++MULTILIB_ALIASES += march?armv5te/mfloat-abi?softfp=mthumb/march?armv5te/mfloat-abi?softfp/mfpu?neon ++MULTILIB_ALIASES += march?armv5te=march?armv5te/mfpu?neon ++MULTILIB_ALIASES += mbig-endian=march?armv5te/mfpu?neon/mbig-endian ++MULTILIB_ALIASES += march?armv5te/mfloat-abi?softfp/mbig-endian=march?armv5te/mfloat-abi?softfp/mfpu?neon/mbig-endian ++MULTILIB_ALIASES += mbig-endian=mthumb/march?armv5te/mfpu?neon/mbig-endian ++MULTILIB_ALIASES += march?armv5te/mfloat-abi?softfp/mbig-endian=mthumb/march?armv5te/mfloat-abi?softfp/mfpu?neon/mbig-endian ++ ++# ARMv6-M and VFP are incompatible. ++# FIXME: The compiler should probably error. ++MULTILIB_EXCEPTIONS += *march=armv6-m/mfloat-abi=softfp ++MULTILIB_ALIASES += mthumb/march?armv6-m=mthumb/march?armv6-m/mfpu?neon ++MULTILIB_EXCEPTIONS += march=armv6-m*mfpu=neon ++MULTILIB_EXCEPTIONS += mthumb/march=armv6-m/mfloat-abi=softfp/mfpu=neon ++ ++# ARMv4t VFP isn't really supported, so use the soft-float libraries. ++MULTILIB_EXCEPTIONS += mfloat-abi?softfp ++MULTILIB_EXCEPTIONS += mfloat-abi?softfp/mfpu?neon ++MULTILIB_ALIASES += mthumb=mthumb/mfloat-abi?softfp ++MULTILIB_ALIASES += mthumb=mthumb/mfloat-abi?softfp/mfpu?neon ++ ++MULTILIB_ALIASES += mbig-endian=mfloat-abi?softfp/mbig-endian ++MULTILIB_ALIASES += mbig-endian=mfloat-abi?softfp/mfpu?neon/mbig-endian ++MULTILIB_ALIASES += mbig-endian=mthumb/mfloat-abi?softfp/mbig-endian ++MULTILIB_ALIASES += mbig-endian=mthumb/mfloat-abi?softfp/mfpu?neon/mbig-endian ++ ++# We don't have a big-endian ARMv6-M compatible multilibs. ++MULTILIB_EXCEPTIONS += *march=armv6-m*mbig-endian ++ ++# Use the generic libraries for big-endian ARMv5T ++MULTILIB_ALIASES += mbig-endian=march?armv5te/mbig-endian ++MULTILIB_ALIASES += mbig-endian=mfloat-abi?softfp/mbig-endian ++MULTILIB_ALIASES += mbig-endian=mthumb/march?armv5te/mbig-endian ++MULTILIB_ALIASES += march?armv5te/mfloat-abi?softfp/mbig-endian=mthumb/march?armv5te/mfloat-abi?softfp/mbig-endian ++ ++# Use ARM libraries for big-endian Thumb. ++MULTILIB_ALIASES += mbig-endian=mthumb/mbig-endian ++ ++# Don't bother with big-endian Thumb-2 VFP. Use the soft-float libraries ++# for now. ++MULTILIB_ALIASES += mthumb/march?armv7/mbig-endian=mthumb/march?armv7/mfloat-abi?softfp/mbig-endian ++ ++# The only -mfloat-abi=hard libraries provided are for little-endian ++# v7-A NEON. ++MULTILIB_EXCEPTIONS += mfloat-abi=hard* ++MULTILIB_EXCEPTIONS += *march=armv5te*mfloat-abi=hard* ++MULTILIB_EXCEPTIONS += *march=armv7/*mfloat-abi=hard* ++MULTILIB_EXCEPTIONS += *march=armv6-m*mfloat-abi=hard* ++MULTILIB_EXCEPTIONS += mthumb/mfloat-abi=hard* ++MULTILIB_EXCEPTIONS += *mfloat-abi=hard*mbig-endian ++MULTILIB_EXCEPTIONS += *mfloat-abi=hard ++ ++# FIXME: We need a sane way of doing this. ++# This isn't really a multilib, it's a hack to add an extra option ++# to the v7-m multilib. ++MULTILIB_OPTIONS += mfix-cortex-m3-ldrd ++MULTILIB_DIRNAMES += broken_ldrd ++ ++MULTILIB_EXCEPTIONS += mfix-cortex-m3-ldrd ++MULTILIB_EXCEPTIONS += mthumb/mfix-cortex-m3-ldrd ++MULTILIB_EXCEPTIONS += *march=armv6-m*mfix-cortex-m3-ldrd ++MULTILIB_EXCEPTIONS += *march=armv7-a*mfix-cortex-m3-ldrd ++MULTILIB_EXCEPTIONS += *mcpu=*mfix-cortex-m3-ldrd ++MULTILIB_EXCEPTIONS += *mbig-endian*mfix-cortex-m3-ldrd ++MULTILIB_EXCEPTIONS += *mfloat-abi=softfp*mfix-cortex-m3-ldrd ++MULTILIB_EXCEPTIONS += *march=armv5te*mfix-cortex-m3-ldrd ++MULTILIB_EXCEPTIONS += *mfpu=neon*mfix-cortex-m3-ldrd ++ ++MULTILIB_ALIASES += mthumb/march?armv7/mfix-cortex-m3-ldrd=mthumb/march?armv7 ++MULTILIB_ALIASES += mthumb/march?armv7/mfix-cortex-m3-ldrd=mthumb/march?armv7-a/mfix-cortex-m3-ldrd ++MULTILIB_ALIASES += mthumb/march?armv7/mfix-cortex-m3-ldrd=mthumb/march?armv7/mfpu?neon/mfix-cortex-m3-ldrd ++MULTILIB_ALIASES += mthumb/march?armv7/mfix-cortex-m3-ldrd=mthumb/march?armv7-a/mfpu?neon/mfix-cortex-m3-ldrd ++ ++# As of at least 4.2, gcc passes the wrong -L options if some multilibs are ++# omitted from MULTILIB_OSDIRNAMES ++MULTILIB_OSDIRNAMES = mthumb=!thumb ++MULTILIB_OSDIRNAMES += mbig-endian=!be ++MULTILIB_OSDIRNAMES += march.armv5te=!armv5te ++MULTILIB_OSDIRNAMES += march.armv5te/mfloat-abi.softfp=!vfp ++MULTILIB_OSDIRNAMES += march.armv5te/mfloat-abi.softfp/mbig-endian=!vfp-be ++MULTILIB_OSDIRNAMES += mthumb/march.armv7/mfix-cortex-m3-ldrd=!thumb2 ++MULTILIB_OSDIRNAMES += march.armv7-a/mfloat-abi.softfp/mfpu.neon=!armv7-a-neon ++MULTILIB_OSDIRNAMES += march.armv7-a/mfloat-abi.hard/mfpu.neon=!armv7-a-hard ++MULTILIB_OSDIRNAMES += mthumb/march.armv7/mbig-endian=!thumb2-be ++MULTILIB_OSDIRNAMES += mthumb/march.armv6-m=!armv6-m ++ ++#MULTILIB_OPTIONS = marm/mthumb ++#MULTILIB_DIRNAMES = arm thumb ++#MULTILIB_EXCEPTIONS = ++#MULTILIB_MATCHES = --#MULTILIB_OPTIONS += march=armv7 --#MULTILIB_DIRNAMES += thumb2 --#MULTILIB_EXCEPTIONS += march=armv7* marm/*march=armv7* --#MULTILIB_MATCHES += march?armv7=march?armv7-a --#MULTILIB_MATCHES += march?armv7=march?armv7-r --#MULTILIB_MATCHES += march?armv7=march?armv7-m --#MULTILIB_MATCHES += march?armv7=mcpu?cortex-a8 --#MULTILIB_MATCHES += march?armv7=mcpu?cortex-r4 --#MULTILIB_MATCHES += march?armv7=mcpu?cortex-m3 -+MULTILIB_OPTIONS += march=armv7/march=armv6-m -+MULTILIB_DIRNAMES += v7m v6m -+MULTILIB_EXCEPTIONS += march=armv7* marm/*march=armv7* -+MULTILIB_MATCHES += march?armv7=march?armv7-a -+MULTILIB_MATCHES += march?armv7=march?armv7-r -+MULTILIB_MATCHES += march?armv7=march?armv7-m -+MULTILIB_MATCHES += march?armv7=mcpu?cortex-a8 -+MULTILIB_MATCHES += march?armv7=mcpu?cortex-r4 -+MULTILIB_MATCHES += march?armv7=mcpu?cortex-m3 -+ -+MULTILIB_EXCEPTIONS += march=armv6-m -+MULTILIB_MATCHES += march?armv6-m=mcpu?cortex-m1 -+MULTILIB_MATCHES += march?armv6-m=mcpu?cortex-m0 - + #MULTILIB_OPTIONS += march=armv7 + #MULTILIB_DIRNAMES += thumb2 +@@ -49,9 +298,9 @@ # Not quite true. We can support hard-vfp calling in Thumb2, but how do we # express that here? Also, we really need architecture v5e or later # (mcrr etc). @@ -39,14 +275,3 @@ # MULTILIB_OPTIONS += mcpu=ep9312 # MULTILIB_DIRNAMES += ep9312 - # MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312* - # --# MULTILIB_OPTIONS += mlittle-endian/mbig-endian --# MULTILIB_DIRNAMES += le be --# MULTILIB_MATCHES += mbig-endian=mbe mlittle-endian=mle -+MULTILIB_OPTIONS += mlittle-endian -+MULTILIB_DIRNAMES += le -+MULTILIB_MATCHES += mlittle-endian=mle - # - # MULTILIB_OPTIONS += mhard-float/msoft-float - # MULTILIB_DIRNAMES += fpu soft diff --git a/darwin/macports/ports/cross/libcmsis/Portfile b/darwin/macports/ports/cross/libcmsis/Portfile index 579b606..b2d698b 100644 --- a/darwin/macports/ports/cross/libcmsis/Portfile +++ b/darwin/macports/ports/cross/libcmsis/Portfile @@ -12,8 +12,7 @@ long_description libcmsis fetch.type git git.url git://git.open-bldc.org/libcmsis.git patchfiles \ - patch-include-cmsis-stm32-h.diff \ - patch-src-Makefile.diff + patch-include-cmsis-stm32-h.diff worksrcdir ${name} use_configure no use_parallel_build no diff --git a/darwin/macports/ports/cross/libcmsis/files/patch-src-Makefile.diff b/darwin/macports/ports/cross/libcmsis/files/patch-src-Makefile.diff index e309b05..347c442 100644 --- a/darwin/macports/ports/cross/libcmsis/files/patch-src-Makefile.diff +++ b/darwin/macports/ports/cross/libcmsis/files/patch-src-Makefile.diff @@ -5,7 +5,7 @@ AR=${compiler_prefix}ar AS=${compiler_prefix}as -CFLAGS=-I../include -Wall -ansi -std=c99 -fno-common -Os -g -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -+CFLAGS=-I../include -Wall -ansi -std=c99 -fno-common -g -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections ++CFLAGS=-I../include -Wall -ansi -std=c99 -fno-common -Os -g -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections ARFLAGS=rcsv ASFLAGS=-ahls -mapcs-32 diff --git a/darwin/macports/ports/cross/libopenstm32/Portfile b/darwin/macports/ports/cross/libopenstm32/Portfile index c325ca3..6651bde 100644 --- a/darwin/macports/ports/cross/libopenstm32/Portfile +++ b/darwin/macports/ports/cross/libopenstm32/Portfile @@ -11,12 +11,6 @@ description libopenstm32 long_description libopenstm32 fetch.type git git.url git://libopenstm32.git.sourceforge.net/gitroot/libopenstm32/libopenstm32 -patchfiles \ - patch-Makefile.diff \ - patch-examples-lpc13xx-Makefile-include.diff \ - patch-examples-stm32-Makefile-include.diff \ - patch-lib-lpc13cc-Makefile.diff \ - patch-lib-stm32-Makefile.diff #worksrcdir ${name} use_configure no diff --git a/darwin/macports/ports/cross/libopenstm32/files/patch-Makefile.diff b/darwin/macports/ports/cross/libopenstm32/files/patch-Makefile.diff deleted file mode 100644 index fe00f75..0000000 --- a/darwin/macports/ports/cross/libopenstm32/files/patch-Makefile.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2011-01-31 22:31:56.000000000 +1100 -+++ Makefile 2011-01-31 22:32:20.000000000 +1100 -@@ -47,7 +47,7 @@ - @printf " BUILD examples/lpc13xx\n" - $(Q)$(MAKE) -C examples/lpc13xx all - --install: build -+install: - @printf " INSTALL headers\n" - $(Q)$(INSTALL) -d $(INCDIR)/libopencm3 - $(Q)$(INSTALL) -d $(LIBDIR) diff --git a/darwin/macports/ports/cross/libopenstm32/files/patch-examples-lpc13xx-Makefile-include.diff b/darwin/macports/ports/cross/libopenstm32/files/patch-examples-lpc13xx-Makefile-include.diff deleted file mode 100644 index efab1b2..0000000 --- a/darwin/macports/ports/cross/libopenstm32/files/patch-examples-lpc13xx-Makefile-include.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- examples/lpc13xx/Makefile.include.orig 2011-01-31 22:20:50.000000000 +1100 -+++ examples/lpc13xx/Makefile.include 2011-01-31 22:21:02.000000000 +1100 -@@ -27,7 +27,7 @@ - # Uncomment this line if you want to use the installed (not local) library. - # TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX) - TOOLCHAIN_DIR = ../../../.. --CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ -+CFLAGS += -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ - -mcpu=cortex-m3 -mthumb - LDSCRIPT = $(BINARY).ld - LDFLAGS += -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/lpc13xx \ diff --git a/darwin/macports/ports/cross/libopenstm32/files/patch-examples-stm32-Makefile-include.diff b/darwin/macports/ports/cross/libopenstm32/files/patch-examples-stm32-Makefile-include.diff deleted file mode 100644 index 0e24217..0000000 --- a/darwin/macports/ports/cross/libopenstm32/files/patch-examples-stm32-Makefile-include.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- examples/stm32/Makefile.include.orig 2011-01-31 22:22:06.000000000 +1100 -+++ examples/stm32/Makefile.include 2011-01-31 22:22:18.000000000 +1100 -@@ -27,7 +27,7 @@ - # Uncomment this line if you want to use the installed (not local) library. - # TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX) - TOOLCHAIN_DIR = ../../../.. --CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \ -+CFLAGS += -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \ - -fno-common -mcpu=cortex-m3 -mthumb - LDSCRIPT = $(BINARY).ld - LDFLAGS += -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/stm32 \ diff --git a/darwin/macports/ports/cross/libopenstm32/files/patch-lib-lpc13cc-Makefile.diff b/darwin/macports/ports/cross/libopenstm32/files/patch-lib-lpc13cc-Makefile.diff deleted file mode 100644 index 88cb293..0000000 --- a/darwin/macports/ports/cross/libopenstm32/files/patch-lib-lpc13cc-Makefile.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/lpc13xx/Makefile.orig 2011-01-31 22:11:42.000000000 +1100 -+++ lib/lpc13xx/Makefile 2011-01-31 22:12:30.000000000 +1100 -@@ -23,7 +23,7 @@ - PREFIX ?= arm-elf - CC = $(PREFIX)-gcc - AR = $(PREFIX)-ar --CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \ -+CFLAGS = -g -Wall -Wextra -I../../include -fno-common \ - -mcpu=cortex-m3 -mthumb -Wstrict-prototypes \ - -ffunction-sections -fdata-sections - # ARFLAGS = rcsv diff --git a/darwin/macports/ports/cross/libopenstm32/files/patch-lib-stm32-Makefile.diff b/darwin/macports/ports/cross/libopenstm32/files/patch-lib-stm32-Makefile.diff deleted file mode 100644 index 6c99f61..0000000 --- a/darwin/macports/ports/cross/libopenstm32/files/patch-lib-stm32-Makefile.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/stm32/Makefile.orig 2011-01-31 22:12:45.000000000 +1100 -+++ lib/stm32/Makefile 2011-01-31 22:12:56.000000000 +1100 -@@ -23,7 +23,7 @@ - PREFIX ?= arm-elf - CC = $(PREFIX)-gcc - AR = $(PREFIX)-ar --CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \ -+CFLAGS = -g -Wall -Wextra -I../../include -fno-common \ - -mcpu=cortex-m3 -mthumb -Wstrict-prototypes \ - -ffunction-sections -fdata-sections - # ARFLAGS = rcsv diff --git a/darwin/macports/ports/cross/libstm32/files/patch-src-Makefile.diff b/darwin/macports/ports/cross/libstm32/files/patch-src-Makefile.diff index 4c5ce74..b5ead0c 100644 --- a/darwin/macports/ports/cross/libstm32/files/patch-src-Makefile.diff +++ b/darwin/macports/ports/cross/libstm32/files/patch-src-Makefile.diff @@ -5,7 +5,7 @@ AR=${compiler_prefix}ar AS=${compiler_prefix}as -CFLAGS=-I../include -fno-common -Os -g -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -+CFLAGS=-I../include -Wall -fno-common -g -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -D'assert_param(_cond)={}' ++CFLAGS=-I../include -fno-common -Os -g -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -D'assert_param(_cond)={}' -Wall ARFLAGS=rcsv ASFLAGS=-ahls -mapcs-32 diff --git a/darwin/macports/ports/cross/libstm32usb/Portfile b/darwin/macports/ports/cross/libstm32usb/Portfile index 8140d85..9921c99 100644 --- a/darwin/macports/ports/cross/libstm32usb/Portfile +++ b/darwin/macports/ports/cross/libstm32usb/Portfile @@ -11,8 +11,6 @@ description libstm32 long_description libstm32 fetch.type git git.url git://git.open-bldc.org/libstm32usb.git -patchfiles \ - patch-src-Makefile.diff worksrcdir ${name} use_configure no diff --git a/darwin/macports/ports/cross/libstm32usb/files/patch-src-Makefile.diff b/darwin/macports/ports/cross/libstm32usb/files/patch-src-Makefile.diff index 1c385ae..2f8d9c5 100644 --- a/darwin/macports/ports/cross/libstm32usb/files/patch-src-Makefile.diff +++ b/darwin/macports/ports/cross/libstm32usb/files/patch-src-Makefile.diff @@ -5,7 +5,7 @@ AR=${compiler_prefix}ar AS=${compiler_prefix}as -CFLAGS=-I../include -fno-common -Os -g -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -+CFLAGS=-I../include -fno-common -g -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections ++CFLAGS=-I../include -fno-common -Os -g -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections ARFLAGS=rcsv ASFLAGS=-ahls -mapcs-32