Permalink
Browse files

update to newer versions

  • Loading branch information...
1 parent 0912127 commit ebb421b796ad7aa7a79aa1dc4b7031c8cbab2eb0 @corecode corecode committed Dec 29, 2012
Showing with 43 additions and 104 deletions.
  1. +22 −73 patches/patch-gcc-config-arm-t-arm-elf.diff
  2. +10 −19 patches/patch-libgcc-divide-exceptions.diff
  3. +11 −12 summon-arm-toolchain
@@ -1,82 +1,34 @@
---- gcc/config/arm/t-arm-elf.orig 2011-10-25 21:33:18.000000000 -0700
-+++ gcc/config/arm/t-arm-elf 2011-10-30 18:15:16.000000000 -0700
-@@ -31,78 +31,33 @@
- _arm_floatdidf _arm_floatdisf _arm_floatundidf _arm_floatundisf \
- _clzsi2 _clzdi2
+--- gcc/config/arm/t-arm-elf.orig 2012-12-29 20:34:05.650026246 +0100
++++ gcc/config/arm/t-arm-elf 2012-12-29 20:44:47.823361749 +0100
+@@ -19,8 +19,8 @@
-+# We have to build 'arm' and 'thumb' libraries, it seems.
MULTILIB_OPTIONS = marm/mthumb
MULTILIB_DIRNAMES = arm thumb
-MULTILIB_EXCEPTIONS =
-MULTILIB_MATCHES =
++# MULTILIB_EXCEPTIONS =
++# MULTILIB_MATCHES =
--#MULTILIB_OPTIONS += mcpu=fa526/mcpu=fa626/mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te
--#MULTILIB_DIRNAMES += fa526 fa626 fa606te fa626te fmp626 fa726te
--#MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626
--
--#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
--
--# 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 += mcpu=fa526/mcpu=fa626/mcpu=fa606te/mcpu=fa626te/mcpu=fmp626/mcpu=fa726te
+ #MULTILIB_DIRNAMES += fa526 fa626 fa606te fa626te fmp626 fa726te
+@@ -39,9 +39,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).
-MULTILIB_OPTIONS += mfloat-abi=hard
-MULTILIB_DIRNAMES += fpu
-MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard*
--#MULTILIB_EXCEPTIONS += *mcpu=fa526/*mfloat-abi=hard*
--#MULTILIB_EXCEPTIONS += *mcpu=fa626/*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 += mhard-float/msoft-float
--# MULTILIB_DIRNAMES += fpu soft
--# MULTILIB_EXCEPTIONS += *mthumb/*mhard-float*
--#
--# MULTILIB_OPTIONS += mno-thumb-interwork/mthumb-interwork
--# MULTILIB_DIRNAMES += normal interwork
--#
--# MULTILIB_OPTIONS += fno-leading-underscore/fleading-underscore
--# MULTILIB_DIRNAMES += elf under
--#
--# MULTILIB_OPTIONS += mcpu=arm7
--# MULTILIB_DIRNAMES += nofmult
--# MULTILIB_EXCEPTIONS += *mthumb*/*mcpu=arm7*
--# # Note: the multilib_exceptions matches both -mthumb and
--# # -mthumb-interwork
--# #
--# # We have to match all the arm cpu variants which do not have the
--# # multiply instruction and treat them as if the user had specified
--# # -mcpu=arm7. Note that in the following the ? is interpreted as
--# # an = for the purposes of matching command line options.
--# # FIXME: There ought to be a better way to do this.
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7d
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7di
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm70
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm700
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm700i
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm710
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm710c
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7100
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7500
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm7500fe
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm6
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm60
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm600
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm610
--# MULTILIB_MATCHES += mcpu?arm7=mcpu?arm620
++# MULTILIB_OPTIONS += mfloat-abi=hard
++# MULTILIB_DIRNAMES += fpu
++# MULTILIB_EXCEPTIONS += *mthumb/*mfloat-abi=hard*
+ #MULTILIB_EXCEPTIONS += *mcpu=fa526/*mfloat-abi=hard*
+ #MULTILIB_EXCEPTIONS += *mcpu=fa626/*mfloat-abi=hard*
+
+@@ -89,3 +89,27 @@
+ # MULTILIB_MATCHES += mcpu?arm7=mcpu?arm600
+ # MULTILIB_MATCHES += mcpu?arm7=mcpu?arm610
+ # MULTILIB_MATCHES += mcpu?arm7=mcpu?arm620
++
+# Only we don't actually want any ARM libraries. Or
+# vanilla thumb libraries.
+MULTILIB_EXCEPTIONS = marm* mthumb
@@ -100,6 +52,3 @@
+MULTILIB_EXCEPTIONS += *arm7tdmi-s*mfloat-abi* *arm7tdmi-s*mfpu*
+MULTILIB_EXCEPTIONS += *cortex-m3*mfloat-abi* *cortex-m3*mfpu*
+MULTILIB_EXCEPTIONS += *cortex-m0*mfloat-abi* *cortex-m0*mfpu*
-
- EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crti.o crtn.o
-
@@ -1,23 +1,23 @@
---- libgcc/Makefile.in.orig 2011-12-26 20:25:30.000000000 -0800
-+++ libgcc/Makefile.in 2011-12-26 21:24:54.000000000 -0800
-@@ -411,14 +411,14 @@
+--- libgcc/Makefile.in.orig 2012-12-11 09:42:29.000000000 +0100
++++ libgcc/Makefile.in 2012-12-29 21:04:48.426699137 +0100
+@@ -500,14 +500,14 @@
lib2-divmod-o = $(patsubst %,%$(objext),$(LIB2_DIVMOD_FUNCS))
- $(lib2-divmod-o): %$(objext): $(gcc_srcdir)/libgcc2.c
- $(gcc_compile) -DL$* -c $(gcc_srcdir)/libgcc2.c \
+ $(lib2-divmod-o): %$(objext): $(srcdir)/libgcc2.c
+ $(gcc_compile) -DL$* -c $< \
- -fexceptions -fnon-call-exceptions $(vis_hide)
-+ -fno-exceptions -fno-non-call-exceptions $(vis_hide)
++ -fno-exceptions -fnon-call-exceptions $(vis_hide)
libgcc-objects += $(lib2-divmod-o)
ifeq ($(enable_shared),yes)
lib2-divmod-s-o = $(patsubst %,%_s$(objext),$(LIB2_DIVMOD_FUNCS))
- $(lib2-divmod-s-o): %_s$(objext): $(gcc_srcdir)/libgcc2.c
- $(gcc_s_compile) -DL$* -c $(gcc_srcdir)/libgcc2.c \
+ $(lib2-divmod-s-o): %_s$(objext): $(srcdir)/libgcc2.c
+ $(gcc_s_compile) -DL$* -c $< \
- -fexceptions -fnon-call-exceptions
-+ -fno-exceptions -fno-non-call-exceptions
++ -fno-exceptions -fnon-call-exceptions
libgcc-s-objects += $(lib2-divmod-s-o)
endif
-@@ -706,7 +706,7 @@
+@@ -814,7 +814,7 @@
# libgcc_eh.a, only LIB2ADDEH matters. If we do, only LIB2ADDEHSTATIC and
# LIB2ADDEHSHARED matter. (Usually all three are identical.)
@@ -26,12 +26,3 @@
ifeq ($(enable_shared),yes)
-@@ -728,7 +728,7 @@
-
- # Build LIBUNWIND.
-
--c_flags := -fexceptions
-+c_flags := -fno-exceptions
-
- libunwind-objects += $(addsuffix $(objext),$(basename $(notdir $(LIBUNWIND))))
-
View
@@ -128,20 +128,20 @@ if [ ${USE_LINARO} == 0 ] ; then
GDBURL=http://ftp.gnu.org/gnu/gdb/${GDB}.tar.bz2
else
# For Linaro GCC:
- GCCRELEASE=4.6-2011.10
- GCCVERSION=4.6-2011.10
+ GCCRELEASE=4.7-2012.12
+ GCCVERSION=4.7-2012.12
GCC=gcc-linaro-${GCCVERSION}
- GCCURL=http://launchpad.net/gcc-linaro/4.6/${GCCRELEASE}/+download/${GCC}.tar.bz2
+ GCCURL=http://launchpad.net/gcc-linaro/4.7/${GCCRELEASE}/+download/${GCC}.tar.bz2
# For Linaro GDB:
- GDBRELEASE=7.3-2011.10
- GDBVERSION=7.3-2011.10
+ GDBRELEASE=7.5-2012.12-1
+ GDBVERSION=7.5-2012.12-1
GDB=gdb-linaro-${GDBVERSION}
- GDBURL=http://launchpad.net/gdb-linaro/7.3/${GDBRELEASE}/+download/${GDB}.tar.bz2
+ GDBURL=http://launchpad.net/gdb-linaro/7.5/${GDBRELEASE}/+download/${GDB}.tar.bz2
fi
-BINUTILS=binutils-2.21.1
-NEWLIB=newlib-1.19.0
+BINUTILS=binutils-2.23.1
+NEWLIB=newlib-2.0.0
OOCD=openocd-0.6.0-rc1
OOCD_GIT=
LIBCMSIS=
@@ -395,9 +395,9 @@ fi
if [ ! -e ${STAMPS}/${BINUTILS}.build ]; then
unpack ${BINUTILS}
log "Patching binutils to allow SVC support on cortex-m3"
- cd ${BINUTILS}
- patch -p1 -i ../patches/patch-binutils-2.21.1-svc-cortexm3.diff
- cd ..
+ # cd ${BINUTILS}
+ # patch -p1 -i ../patches/patch-binutils-2.21.1-svc-cortexm3.diff
+ # cd ..
cd build
log "Configuring ${BINUTILS}"
../${BINUTILS}/configure --target=${TARGET} \
@@ -430,7 +430,6 @@ if [ ! -e ${STAMPS}/${GCC}-${NEWLIB}.build ]; then
log "Patching gcc to add multilib support"
cd ${GCC}
patch -p0 -i ../patches/patch-gcc-config-arm-t-arm-elf.diff
- patch -p1 -i ../patches/patch-gcc-gengtype-fix.diff
patch -p0 -i ../patches/patch-libgcc-divide-exceptions.diff
cd ..
fi

0 comments on commit ebb421b

Please sign in to comment.