Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3758
-gerrit
commit 3c676ec45e516225b5fde9465db331b5e2d5ae9c Author: Stefan Reinauer reinauer@chromium.org Date: Wed Jul 10 14:27:56 2013 -0700
buildgcc: Update reference toolchain
* GCC 4.8.1 * binutils 2.23.2 * GDB 7.6 * ACPICA 20130626 * Python 3.3.2
... this adds support for Aarch64. For Ron.
Change-Id: Idec91bcd615bc35c83373bd23d4681f1c8eb015c Signed-off-by: Stefan Reinauer reinauer@google.com --- util/crossgcc/buildgcc | 39 +++++++----- ...0121114_32bit_optimization_fortify_source.patch | 11 ---- ...nix-20121114_drop_cflags_unknown_to_xcode.patch | 20 ------- ...cpica-unix-20121114_no_remove_destination.patch | 12 ---- .../acpica-unix-20121114_override_make.patch | 69 ---------------------- util/crossgcc/patches/binutils-2.23.2_armv7a.patch | 12 ++++ .../patches/binutils-2.23.2_no-bfd-doc.patch | 12 ++++ util/crossgcc/patches/binutils-2.23_armv7a.patch | 12 ---- .../patches/binutils-2.23_no-bfd-doc.patch | 12 ---- util/crossgcc/patches/gcc-4.7.3_armv7a.patch | 12 ---- util/crossgcc/patches/gdb-7.5_pythonhome.patch | 19 ------ util/crossgcc/patches/gdb-7.6_no-texinfo.patch | 14 +++++ util/crossgcc/patches/gdb-7.6_pythonhome.patch | 19 ++++++ 13 files changed, 80 insertions(+), 183 deletions(-)
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 4458ea4..7dcea38 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -20,8 +20,8 @@ # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA #
-CROSSGCC_DATE="April 19th, 2013" -CROSSGCC_VERSION="1.21" +CROSSGCC_DATE="July 9th, 2013" +CROSSGCC_VERSION="1.22"
# default settings TARGETDIR=`pwd`/xgcc @@ -29,16 +29,16 @@ TARGETARCH=i386-elf DESTDIR=
# version numbers -GMP_VERSION=5.0.5 -MPFR_VERSION=3.1.1 +GMP_VERSION=5.1.2 +MPFR_VERSION=3.1.2 MPC_VERSION=1.0.1 LIBELF_VERSION=0.8.13 -GCC_VERSION=4.7.3 -GCC_AUTOCONF_VERSION=2.64 -BINUTILS_VERSION=2.23 -GDB_VERSION=7.5 -IASL_VERSION=20121114 -PYTHON_VERSION=2.7.3 +GCC_VERSION=4.8.1 +GCC_AUTOCONF_VERSION=2.69 +BINUTILS_VERSION=2.23.2 +GDB_VERSION=7.6 +IASL_VERSION=20130626 +PYTHON_VERSION=3.3.2 EXPAT_VERSION=2.1.0
# archive locations @@ -47,7 +47,7 @@ MPFR_ARCHIVE="http://ftpmirror.gnu.org/mpfr/mpfr-$%7BMPFR_VERSION%7D.tar.bz2" MPC_ARCHIVE="http://ftpmirror.gnu.org/mpc/mpc-$%7BMPC_VERSION%7D.tar.gz" LIBELF_ARCHIVE="http://www.mr511.de/software/libelf-$%7BLIBELF_VERSION%7D.tar.gz" GCC_ARCHIVE="http://ftpmirror.gnu.org/gcc/gcc-$%7BGCC_VERSION%7D/gcc-$%7BGCC_VERSION%7D.t..." -BINUTILS_ARCHIVE="http://ftpmirror.gnu.org/binutils/binutils-$%7BBINUTILS_VERSION%7D.tar.gz" +BINUTILS_ARCHIVE="http://ftpmirror.gnu.org/binutils/binutils-$%7BBINUTILS_VERSION%7D.tar.bz2" GDB_ARCHIVE="http://ftpmirror.gnu.org/gdb/gdb-$%7BGDB_VERSION%7D.tar.bz2" IASL_ARCHIVE="http://www.acpica.org/sites/acpica/files/acpica-unix-$%7BIASL_VERSION%7D.tar..." PYTHON_ARCHIVE="http://www.python.org/ftp/python/$%7BPYTHON_VERSION%7D/Python-$%7BPYTHON_VER..." @@ -78,6 +78,8 @@ cyan='\033[0;36m' CYAN='\033[1;36m' NC='\033[0m' # No Color
+UNAME=`uname` + normalize_dirs() { mkdir -p $DESTDIR$TARGETDIR/lib @@ -104,7 +106,7 @@ searchgnu() fi done # A workaround for XxxBSD, whose nongnu patch and tar also work. - if [ `uname` = "FreeBSD" -o `uname` = "NetBSD" ]; then + if [ $UNAME = "FreeBSD" -o $UNAME = "NetBSD" ]; then if [ $1 != "make" ]; then if test -x "`which $1 2>/dev/null`"; then echo $1 @@ -227,7 +229,8 @@ case "$TARGETARCH" in i386-mingw32) ;; i386*) TARGETARCH=i386-elf;; arm*) TARGETARCH=armv7a-eabi;; - *) printf "Invalid architecture\n\n"; myhelp; exit 1;; + aarch64*) TARGETARCH=aarch64-elf;; + *) printf "${red}WARNING: Unsupported architecture $TARGETARCH.${NC}\n\n"; ;; esac
echo "Target arch is now $TARGETARCH" @@ -302,7 +305,7 @@ printf "Unpacked and patched ... " printf "${green}ok${NC}\n"
CC=cc -if [ `uname` = "Darwin" ]; then +if [ $UNAME = "Darwin" ]; then #GCC_OPTIONS="$GCC_OPTIONS --enable-threads=posix"
# generally the OS X compiler can create x64 binaries. @@ -368,7 +371,7 @@ if [ -f build-mpfr/.success ]; then else printf "Building MPFR ${MPFR_VERSION} ... " ( - test `uname` = "Darwin" && CFLAGS="$CFLAGS -force_cpusubtype_ALL" + test $UNAME = "Darwin" && CFLAGS="$CFLAGS -force_cpusubtype_ALL" cd build-mpfr rm -f .failed CC="$CC" ../${MPFR_DIR}/configure --disable-shared --prefix=$TARGETDIR \ @@ -594,7 +597,11 @@ printf "Building IASL ${IASL_VERSION} ... " cd $IASL_DIR/generate/unix rm -f .failed CFLAGS="$HOSTCFLAGS" - $MAKE CC="$CC" iasl || touch .failed + HOST="_LINUX" + test $UNAME = "Darwin" && HOST="_APPLE" + test $UNAME = "FreeBSD" && HOST="_FreeBSD" + test $UNAME = "Cygwin" && HOST="_CYGWIN" + HOST="$HOST" OPT_CFLAGS="-O -D_FORTIFY_SOURCE=2" CFLAGS="$CFLAGS" $MAKE CC="$CC" iasl || touch .failed rm -f $DESTDIR$TARGETDIR/bin/iasl || touch .failed if [ -d bin32 ]; then cp bin32/iasl $DESTDIR$TARGETDIR/bin || touch .failed ; fi if [ -d bin64 ]; then cp bin64/iasl $DESTDIR$TARGETDIR/bin || touch .failed ; fi diff --git a/util/crossgcc/patches/acpica-unix-20121114_32bit_optimization_fortify_source.patch b/util/crossgcc/patches/acpica-unix-20121114_32bit_optimization_fortify_source.patch deleted file mode 100644 index abf80bd..0000000 --- a/util/crossgcc/patches/acpica-unix-20121114_32bit_optimization_fortify_source.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur acpica-unix-20121114/generate/unix/Makefile.config acpica-unix-20121114.patched/generate/unix/Makefile.config ---- acpica-unix-20121114/generate/unix/Makefile.config 2012-11-14 17:22:38.000000000 +0100 -+++ acpica-unix-20121114.patched/generate/unix/Makefile.config 2012-11-15 21:19:36.683902859 +0100 -@@ -104,6 +104,7 @@ - # automatically included in -Wall. - # - CFLAGS += \ -+ -O \ - $(BITSFLAG) \ - -D$(HOST) \ - -D_GNU_SOURCE \ diff --git a/util/crossgcc/patches/acpica-unix-20121114_drop_cflags_unknown_to_xcode.patch b/util/crossgcc/patches/acpica-unix-20121114_drop_cflags_unknown_to_xcode.patch deleted file mode 100644 index a4d55da..0000000 --- a/util/crossgcc/patches/acpica-unix-20121114_drop_cflags_unknown_to_xcode.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur acpica-unix-20121114.orig/generate/unix/Makefile.config acpica-unix-20121114/generate/unix/Makefile.config ---- acpica-unix-20121114.orig/generate/unix/Makefile.config 2012-11-14 08:22:38.000000000 -0800 -+++ acpica-unix-20121114/generate/unix/Makefile.config 2012-12-05 15:53:35.000000000 -0800 -@@ -135,15 +135,11 @@ - -Waggregate-return \ - -Wchar-subscripts \ - -Wempty-body \ -- -Wlogical-op \ - -Wmissing-declarations \ - -Wmissing-field-initializers \ -- -Wmissing-parameter-type \ - -Wnested-externs \ -- -Wold-style-declaration \ - -Wold-style-definition \ -- -Wredundant-decls \ -- -Wtype-limits -+ -Wredundant-decls - - # - # Extra warning flags (possible future use) diff --git a/util/crossgcc/patches/acpica-unix-20121114_no_remove_destination.patch b/util/crossgcc/patches/acpica-unix-20121114_no_remove_destination.patch deleted file mode 100644 index 85a6f1b..0000000 --- a/util/crossgcc/patches/acpica-unix-20121114_no_remove_destination.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur acpica-unix-20121114.orig/generate/unix/Makefile.config acpica-unix-20121114/generate/unix/Makefile.config ---- acpica-unix-20121114.orig/generate/unix/Makefile.config 2012-12-05 16:11:48.000000000 -0800 -+++ acpica-unix-20121114/generate/unix/Makefile.config 2012-12-05 16:12:31.000000000 -0800 -@@ -57,7 +57,7 @@ - # - COPYPROG = \ - @mkdir -p ../$(BINDIR); \ -- cp --remove-destination $(PROG) ../$(BINDIR); \ -+ cp $(PROG) ../$(BINDIR); \ - echo "Copied $(PROG) to $(FINAL_PROG)"; - - # diff --git a/util/crossgcc/patches/acpica-unix-20121114_override_make.patch b/util/crossgcc/patches/acpica-unix-20121114_override_make.patch deleted file mode 100644 index 055db0a..0000000 --- a/util/crossgcc/patches/acpica-unix-20121114_override_make.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Nurbs acpica-unix-20121114.orig/generate/unix/Makefile.common acpica-unix-20121114/generate/unix/Makefile.common ---- acpica-unix-20121114.orig/generate/unix/Makefile.common 2012-11-15 00:22:38.000000000 +0800 -+++ acpica-unix-20121114/generate/unix/Makefile.common 2013-02-09 12:11:55.994133871 +0800 -@@ -19,17 +19,17 @@ - if [ $(BITS) -eq 32 ]; then \ - echo "Forced 32-bit generation of $@"; \ - mkdir -p obj32; \ -- make BITS=32; \ -+ $(MAKE) BITS=32; \ - echo "32-bit version of $@:"; \ - ls -al ../bin32/$@; \ - elif [ $(findstring 64,$(HARDWARE_NAME)) ]; then \ - mkdir -p obj64; \ -- make BITS=64; \ -+ $(MAKE) BITS=64; \ - echo "64-bit version of $@:"; \ - ls -al ../bin64/$@; \ - else \ - mkdir -p obj32; \ -- make BITS=32; \ -+ $(MAKE) BITS=32; \ - echo "32-bit version of $@:"; \ - ls -al ../bin32/$@; \ - fi; -@@ -47,7 +47,7 @@ - (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ - pwd; \ - mkdir -p obj32; \ -- make BITS=32; \ -+ $(MAKE) BITS=32; \ - echo "32-bit version of $$toolname:"; \ - ls -al obj32/$$toolname \ - ); \ -@@ -61,7 +61,7 @@ - (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ - pwd; \ - mkdir -p obj64; \ -- make BITS=64; \ -+ $(MAKE) BITS=64; \ - echo "64-bit version of $$toolname:"; \ - ls -al obj64/$$toolname \ - ); \ -@@ -73,11 +73,11 @@ - echo "Removing $$toolname"; \ - pwd; \ - if [ -d "obj32" ] ; then \ -- make BITS=32 clean; \ -+ $(MAKE) BITS=32 clean; \ - rmdir obj32; \ - fi; \ - if [ -d "obj64" ] ; then \ -- make BITS=64 clean; \ -+ $(MAKE) BITS=64 clean; \ - rmdir obj64; \ - fi; \ - echo ""; \ -@@ -92,10 +92,10 @@ - (cd $(BUILD_DIRECTORY_PATH)/$$toolname; \ - pwd; \ - if [ $(findstring 64,$(HARDWARE_NAME)) ]; then \ -- make BITS=64 PROG=$$toolname install; \ -+ $(MAKE) BITS=64 PROG=$$toolname install; \ - echo "Installed 64-bit version of $$toolname"; \ - else \ -- make BITS=32 PROG=$$toolname install; \ -+ $(MAKE) BITS=32 PROG=$$toolname install; \ - echo "Installed 32-bit version of $$toolname"; \ - fi; \ - echo ""; \ diff --git a/util/crossgcc/patches/binutils-2.23.2_armv7a.patch b/util/crossgcc/patches/binutils-2.23.2_armv7a.patch new file mode 100644 index 0000000..a3c2d63 --- /dev/null +++ b/util/crossgcc/patches/binutils-2.23.2_armv7a.patch @@ -0,0 +1,12 @@ +diff -u binutils-2.23.2/config.sub binutils-2.23.2/config.sub +--- binutils-2.23.2/config.sub 2012-04-25 08:53:25.000000000 -0700 ++++ binutils-2.23.2/config.sub 2012-12-04 14:58:16.050136773 -0800 +@@ -259,7 +259,7 @@ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | arc | arm | arm[bl]e | arme[lb] | armv* | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ + | bfin \ + | c4x | clipper \ diff --git a/util/crossgcc/patches/binutils-2.23.2_no-bfd-doc.patch b/util/crossgcc/patches/binutils-2.23.2_no-bfd-doc.patch new file mode 100644 index 0000000..98e202f --- /dev/null +++ b/util/crossgcc/patches/binutils-2.23.2_no-bfd-doc.patch @@ -0,0 +1,12 @@ +diff -ur binutils-2.23.2/bfd/Makefile.in binutils-2.23.2.patched/bfd/Makefile.in +--- binutils-2.23.2/bfd/Makefile.in 2012-10-22 14:33:51.000000000 +0200 ++++ binutils-2.23.2.patched/bfd/Makefile.in 2012-10-24 15:33:04.442080163 +0200 +@@ -323,7 +323,7 @@ + RELEASE = y + INCDIR = $(srcdir)/../include + CSEARCH = -I. -I$(srcdir) -I$(INCDIR) +-SUBDIRS = doc po ++SUBDIRS = po + bfddocdir = doc + libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ + @SHARED_LDFLAGS@ $(am__empty) diff --git a/util/crossgcc/patches/binutils-2.23_armv7a.patch b/util/crossgcc/patches/binutils-2.23_armv7a.patch deleted file mode 100644 index 63bcc9c..0000000 --- a/util/crossgcc/patches/binutils-2.23_armv7a.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u binutils-2.23/config.sub binutils-2.23/config.sub ---- binutils-2.23/config.sub 2012-04-25 08:53:25.000000000 -0700 -+++ binutils-2.23/config.sub 2012-12-04 14:58:16.050136773 -0800 -@@ -259,7 +259,7 @@ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv* | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ - | bfin \ - | c4x | clipper \ diff --git a/util/crossgcc/patches/binutils-2.23_no-bfd-doc.patch b/util/crossgcc/patches/binutils-2.23_no-bfd-doc.patch deleted file mode 100644 index a8972fe..0000000 --- a/util/crossgcc/patches/binutils-2.23_no-bfd-doc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur binutils-2.23/bfd/Makefile.in binutils-2.23.patched/bfd/Makefile.in ---- binutils-2.23/bfd/Makefile.in 2012-10-22 14:33:51.000000000 +0200 -+++ binutils-2.23.patched/bfd/Makefile.in 2012-10-24 15:33:04.442080163 +0200 -@@ -323,7 +323,7 @@ - RELEASE = y - INCDIR = $(srcdir)/../include - CSEARCH = -I. -I$(srcdir) -I$(INCDIR) --SUBDIRS = doc po -+SUBDIRS = po - bfddocdir = doc - libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ - @SHARED_LDFLAGS@ $(am__empty) diff --git a/util/crossgcc/patches/gcc-4.7.3_armv7a.patch b/util/crossgcc/patches/gcc-4.7.3_armv7a.patch deleted file mode 100644 index ccbc01e..0000000 --- a/util/crossgcc/patches/gcc-4.7.3_armv7a.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gcc-4.7.3/config.sub gcc-4.7.3-patched/config.sub ---- gcc-4.7.3/config.sub 2012-08-06 16:34:27.000000000 +0200 -+++ gcc-4.7.3-patched/config.sub 2013-04-19 00:25:16.401391381 +0200 -@@ -250,7 +250,7 @@ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv* | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ - | bfin \ - | c4x | clipper \ diff --git a/util/crossgcc/patches/gdb-7.5_pythonhome.patch b/util/crossgcc/patches/gdb-7.5_pythonhome.patch deleted file mode 100644 index 8a5ad09..0000000 --- a/util/crossgcc/patches/gdb-7.5_pythonhome.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ur gdb-7.5/gdb/python/python.c gdb-7.5.patched/gdb/python/python.c ---- gdb-7.5/gdb/python/python.c 2012-06-25 18:53:20.000000000 +0200 -+++ gdb-7.5.patched/gdb/python/python.c 2012-10-24 15:28:37.422047559 +0200 -@@ -1227,6 +1227,15 @@ - SLASH_STRING, "python", NULL)); - #endif - -+ char readlinkbuffer[BUFSIZ]; -+ int readlinks = readlink("/proc/self/exe", readlinkbuffer, BUFSIZ - 1); -+ readlinkbuffer[readlinks] = 0; -+ char *executeablepath = dirname(readlinkbuffer); -+ char *pythonhome = malloc(strlen(executeablepath) + strlen("/../") + 2); -+ strcpy(pythonhome, executeablepath); -+ strcat(pythonhome, "/../"); -+ setenv("PYTHONHOME", pythonhome, 1); -+ - Py_Initialize (); - PyEval_InitThreads (); - diff --git a/util/crossgcc/patches/gdb-7.6_no-texinfo.patch b/util/crossgcc/patches/gdb-7.6_no-texinfo.patch new file mode 100644 index 0000000..ac9241c --- /dev/null +++ b/util/crossgcc/patches/gdb-7.6_no-texinfo.patch @@ -0,0 +1,14 @@ +diff -ur gdb-7.6.orig/missing gdb-7.6/missing +--- gdb-7.6.orig/missing 2009-08-22 04:48:33.000000000 -0700 ++++ gdb-7.6/missing 2013-07-10 13:10:32.940902728 -0700 +@@ -314,8 +314,8 @@ + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. +- test -f $file || exit 1 +- touch $file ++ #test -f $file || exit 1 ++ #touch $file + ;; + + tar*) diff --git a/util/crossgcc/patches/gdb-7.6_pythonhome.patch b/util/crossgcc/patches/gdb-7.6_pythonhome.patch new file mode 100644 index 0000000..dfca5dd --- /dev/null +++ b/util/crossgcc/patches/gdb-7.6_pythonhome.patch @@ -0,0 +1,19 @@ +diff -ur gdb-7.6/gdb/python/python.c gdb-7.6.patched/gdb/python/python.c +--- gdb-7.6/gdb/python/python.c 2012-06-25 18:53:20.000000000 +0200 ++++ gdb-7.6.patched/gdb/python/python.c 2012-10-24 15:28:37.422047.69 +0200 +@@ -1227,6 +1227,15 @@ + SLASH_STRING, "python", NULL)); + #endif + ++ char readlinkbuffer[BUFSIZ]; ++ int readlinks = readlink("/proc/self/exe", readlinkbuffer, BUFSIZ - 1); ++ readlinkbuffer[readlinks] = 0; ++ char *executeablepath = dirname(readlinkbuffer); ++ char *pythonhome = malloc(strlen(executeablepath) + strlen("/../") + 2); ++ strcpy(pythonhome, executeablepath); ++ strcat(pythonhome, "/../"); ++ setenv("PYTHONHOME", pythonhome, 1); ++ + Py_Initialize (); + PyEval_InitThreads (); +