Skip to content

Commit

Permalink
Added patch file to gcc-linaro port
Browse files Browse the repository at this point in the history
  • Loading branch information
rbdavison committed Feb 2, 2011
1 parent 7992e0a commit 12f2e4f
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 11 deletions.
4 changes: 3 additions & 1 deletion darwin/macports/ports/PortIndex
Expand Up @@ -4,6 +4,8 @@ arm-none-eabi-gcc-linaro 527
portdir cross/arm-none-eabi-gcc-linaro description {gcc cross-compilers for arm-none-eabi, with newlib runtime library.} homepage http://gcc.gnu.org/ epoch 0 platforms darwin name arm-none-eabi-gcc-linaro depends_lib {port:gmp port:mpfr port:mpc port:libmpc port:gettext port:libiconv port:arm-none-eabi-binutils} license unknown maintainers nomaintainer long_description {gnu compilers collection (including c and c++) for arm-none-eabi, with newlib runtime library.} categories {cross devel} version 4.5-2011.01-1 revision 0
arm-none-eabi-gdb 494
variants universal portdir cross/arm-none-eabi-gdb description {GDB for the arm-none-eabi processors} homepage http://www.gnu.org/software/gdb/gdb.html epoch 0 platforms darwin name arm-none-eabi-gdb depends_lib port:arm-none-eabi-gcc-linaro long_description {arm-none-eabi-gdb is a version of the GNU Debugger that through the avarice program can be used to debug code for the arm-none-eabi processors.} maintainers nomaintainer license unknown categories {cross devel} version 7.2 revision 0
cortex-m3-gcc 577
portdir cross/cortex-m3-gcc description {gcc cross-compilers for arm-none-eabi with only the cortex-m3 cpu enabled, with newlib runtime library.} homepage http://gcc.gnu.org/ epoch 0 platforms darwin name cortex-m3-gcc depends_lib {port:gmp port:mpfr port:mpc port:libmpc port:gettext port:libiconv port:arm-none-eabi-binutils} license unknown maintainers nomaintainer long_description {gnu compilers collection (including c and c++) for arm-none-eabi with only the cortex-m3 cpu enabled, with newlib runtime library.} categories {cross devel} version 4.5-2011.01-1 revision 0
libcmsis 288
portdir cross/libcmsis description libcmsis depends_fetch bin:git:git-core epoch 0 platforms darwin name libcmsis depends_lib port:arm-none-eabi-gcc-linaro license unknown maintainers nomaintainer long_description libcmsis categories {cross devel} version master-2011.01.20.01 revision 0
libopenstm32 304
Expand All @@ -23,4 +25,4 @@ variants universal portdir devel/jsbsim description {JSBsim flight dynamics & co
paparazzi 364
portdir devel/paparazzi depends_fetch bin:git:git-core description {Paparazzi source code} homepage http://paparazzi.enac.fr/Wiki epoch 0 platforms darwin name paparazzi depends_lib port:paparazzi-tools license unknown maintainers nomaintainer long_description {The requirements for building and developing with Paparazzi.} categories devel version 0.1 revision 0
paparazzi-tools 726
portdir devel/paparazzi-tools description {Paparazzi Developer Tools} homepage http://paparazzi.enac.fr/Wiki epoch 0 platforms darwin name paparazzi-tools depends_lib {port:git-core port:xml-light port:caml-ocamlnet port:libftdi port:lablgtk2 port:gtk-theme-switch port:gnome-themes port:gmp port:mpfr port:libmpc port:ivy-c port:ivy-ocaml port:arm-none-eabi-binutils port:arm-none-eabi-gcc-linaro port:arm-none-eabi-gdb port:openocd port:libcmsis port:libstm32 port:libstm32usb port:libopenstm32 port:wget} license unknown maintainers nomaintainer long_description {Paparazzi Developer Tools is the suite of applications and tools required for building and developing with Paparazzi.} categories devel version 0.1 revision 0
portdir devel/paparazzi-tools description {Paparazzi Developer Tools} homepage http://paparazzi.enac.fr/Wiki epoch 0 platforms darwin name paparazzi-tools depends_lib {port:git-core port:xml-light port:caml-ocamlnet port:libftdi port:lablgtk2 port:gtk-theme-switch port:gnome-themes port:gmp port:mpfr port:libmpc port:wget port:ivy-c port:ivy-ocaml port:arm-none-eabi-binutils port:arm-none-eabi-gcc-linaro port:arm-none-eabi-gdb port:openocd port:libcmsis port:libstm32 port:libstm32usb port:libopenstm32} license unknown maintainers nomaintainer long_description {Paparazzi Developer Tools is the suite of applications and tools required for building and developing with Paparazzi.} categories devel version 0.1 revision 0
21 changes: 11 additions & 10 deletions darwin/macports/ports/PortIndex.quick
@@ -1,13 +1,14 @@
arm-none-eabi-binutils 0
arm-none-eabi-gcc-linaro 322
arm-none-eabi-gdb 878
libcmsis 1394
libopenstm32 1695
libstm32 2016
libstm32usb 2317
openocd 2627
ivy-c 3143
ivy-ocaml 3502
jsbsim 3898
paparazzi 4304
paparazzi-tools 4682
cortex-m3-gcc 1394
libcmsis 1989
libopenstm32 2290
libstm32 2611
libstm32usb 2912
openocd 3222
ivy-c 3738
ivy-ocaml 4097
jsbsim 4493
paparazzi 4899
paparazzi-tools 5277
4 changes: 4 additions & 0 deletions darwin/macports/ports/cross/arm-none-eabi-gcc-linaro/Portfile
Expand Up @@ -47,6 +47,10 @@ post-extract {
system "ln -s ${workpath}/newlib-${newlibversion}/newlib ${workpath}/gcc-linaro-${version}/"
}

patch.dir ${workpath}/gcc-linaro-${version}
patchfiles \
patch-gcc-config-arm-t-arm-elf.diff

# Since we don't build gcc and binutils at the same time, gcc's Makefile will try to transform
# program names as gcc's name (add -${version} with ${version} being the version of gcc).
# But it won't work because binutils binaries don't have the ${version} suffix, and even if they
Expand Down
@@ -0,0 +1,52 @@
--- 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 @@
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

# 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).
-MULTILIB_OPTIONS += mfloat-abi=hard
-MULTILIB_DIRNAMES += fpu
-MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard*
+#MULTILIB_OPTIONS += mfloat-abi=hard
+#MULTILIB_DIRNAMES += fpu
+#MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard*

# 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

0 comments on commit 12f2e4f

Please sign in to comment.