[coreboot-gerrit] New patch to review for coreboot: buildgcc: Update gdb and expat

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Fri Apr 22 03:15:03 CEST 2016


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14461

-gerrit

commit f28923860452f2dc64634df786936ffa8337909a
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Thu Apr 21 18:10:15 2016 -0700

    buildgcc: Update gdb and expat
    
    Update gdb to 7.11 and expat to 2.1.1
    riscv64-elf is still broken.
    
    Change-Id: Id7605f4274fcb15f9c3e366f5c492328f70f7956
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
 util/crossgcc/buildgcc                           |  6 +--
 util/crossgcc/patches/gdb-7.11_amd64.patch       | 15 ++++++
 util/crossgcc/patches/gdb-7.11_no-doc.patch      | 12 +++++
 util/crossgcc/patches/gdb-7.11_pythonhome.patch  | 19 ++++++++
 util/crossgcc/patches/gdb-7.9.1_amd64.patch      | 15 ------
 util/crossgcc/patches/gdb-7.9.1_no-doc.patch     | 12 -----
 util/crossgcc/patches/gdb-7.9.1_pythonhome.patch | 19 --------
 util/crossgcc/patches/gdb-7.9.1_sim-arange.patch | 61 ------------------------
 util/crossgcc/sum/expat-2.1.0.tar.gz.cksum       |  1 -
 util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum      |  1 +
 util/crossgcc/sum/gdb-7.11.tar.xz.cksum          |  1 +
 util/crossgcc/sum/gdb-7.9.1.tar.xz.cksum         |  1 -
 12 files changed, 51 insertions(+), 112 deletions(-)

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 3db4dc6..487dd2c 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -39,10 +39,10 @@ LIBELF_VERSION=0.8.13
 GCC_VERSION=5.3.0
 GCC_AUTOCONF_VERSION=2.69
 BINUTILS_VERSION=2.26
-GDB_VERSION=7.9.1
+GDB_VERSION=7.11
 IASL_VERSION=20160318
 PYTHON_VERSION=3.4.3
-EXPAT_VERSION=2.1.0
+EXPAT_VERSION=2.1.1
 # CLANG version number
 CLANG_VERSION=3.8.0
 MAKE_VERSION=4.1
@@ -60,7 +60,7 @@ BINUTILS_ARCHIVE="http://ftpmirror.gnu.org/binutils/binutils-${BINUTILS_VERSION}
 GDB_ARCHIVE="http://ftpmirror.gnu.org/gdb/gdb-${GDB_VERSION}.tar.xz"
 IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix2-${IASL_VERSION}.tar.gz"
 PYTHON_ARCHIVE="http://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz"
-EXPAT_ARCHIVE="http://downloads.sourceforge.net/sourceforge/expat/expat-${EXPAT_VERSION}.tar.gz"
+EXPAT_ARCHIVE="http://downloads.sourceforge.net/sourceforge/expat/expat-${EXPAT_VERSION}.tar.bz2"
 # CLANG toolchain archive locations
 LLVM_ARCHIVE="http://llvm.org/releases/${CLANG_VERSION}/llvm-${CLANG_VERSION}.src.tar.xz"
 CFE_ARCHIVE="http://llvm.org/releases/${CLANG_VERSION}/cfe-${CLANG_VERSION}.src.tar.xz"
diff --git a/util/crossgcc/patches/gdb-7.11_amd64.patch b/util/crossgcc/patches/gdb-7.11_amd64.patch
new file mode 100644
index 0000000..ef6b260
--- /dev/null
+++ b/util/crossgcc/patches/gdb-7.11_amd64.patch
@@ -0,0 +1,15 @@
+diff -urN gdb-7.11.orig/gdb/configure.tgt gdb-7.11/gdb/configure.tgt
+--- gdb-7.11.orig/gdb/configure.tgt	2016-02-09 19:19:39.000000000 -0800
++++ gdb-7.11/gdb/configure.tgt	2016-04-21 17:42:32.628433139 -0700
+@@ -681,6 +681,11 @@
+ 			i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
+ 			obsd-tdep.o bsd-uthread.o solib-svr4.o"
+ 	;;
++x86_64-*-*)
++	# Target: amd64
++	gdb_target_obs="amd64-tdep.o i386-tdep.o i387-tdep.o"
++	;;
++
+ xtensa*-*-linux*)	gdb_target=linux
+ 	# Target: GNU/Linux Xtensa
+ 	gdb_target_obs="xtensa-tdep.o xtensa-config.o xtensa-linux-tdep.o \
diff --git a/util/crossgcc/patches/gdb-7.11_no-doc.patch b/util/crossgcc/patches/gdb-7.11_no-doc.patch
new file mode 100644
index 0000000..6cd5e49
--- /dev/null
+++ b/util/crossgcc/patches/gdb-7.11_no-doc.patch
@@ -0,0 +1,12 @@
+diff -urN gdb-7.11.orig/gdb/Makefile.in gdb-7.11/gdb/Makefile.in
+--- gdb-7.11.orig/gdb/Makefile.in	2016-02-24 01:55:15.000000000 -0800
++++ gdb-7.11/gdb/Makefile.in	2016-04-21 17:44:32.721472633 -0700
+@@ -1092,7 +1092,7 @@
+ 
+ TSOBS = inflow.o
+ 
+-SUBDIRS = doc @subdirs@ data-directory $(GNULIB_BUILDDIR)
++SUBDIRS = @subdirs@ data-directory $(GNULIB_BUILDDIR)
+ CLEANDIRS = $(SUBDIRS)
+ 
+ # List of subdirectories in the build tree that must exist.
diff --git a/util/crossgcc/patches/gdb-7.11_pythonhome.patch b/util/crossgcc/patches/gdb-7.11_pythonhome.patch
new file mode 100644
index 0000000..9bf88be
--- /dev/null
+++ b/util/crossgcc/patches/gdb-7.11_pythonhome.patch
@@ -0,0 +1,19 @@
+diff -urN gdb-7.11.orig/gdb/python/python.c gdb-7.11/gdb/python/python.c
+--- gdb-7.11.orig/gdb/python/python.c	2016-02-09 19:19:39.000000000 -0800
++++ gdb-7.11/gdb/python/python.c	2016-04-21 17:45:39.119833428 -0700
+@@ -1748,6 +1748,15 @@
+ #endif
+ #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.9.1_amd64.patch b/util/crossgcc/patches/gdb-7.9.1_amd64.patch
deleted file mode 100644
index c3ee93d..0000000
--- a/util/crossgcc/patches/gdb-7.9.1_amd64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN gdb-7.9.1.orig/gdb/configure.tgt gdb-7.9.1/gdb/configure.tgt
---- gdb-7.9.1.orig/gdb/configure.tgt	2015-05-13 10:36:05.000000000 -0700
-+++ gdb-7.9.1/gdb/configure.tgt	2016-02-27 11:26:26.386113921 -0800
-@@ -683,6 +683,11 @@
- 			i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
- 			obsd-tdep.o bsd-uthread.o solib-svr4.o"
- 	;;
-+x86_64-*-*)
-+	# Target: amd64
-+	gdb_target_obs="amd64-tdep.o i386-tdep.o i387-tdep.o"
-+	;;
-+
- xtensa*-*-linux*)	gdb_target=linux
- 	# Target: GNU/Linux Xtensa
- 	gdb_target_obs="xtensa-tdep.o xtensa-config.o xtensa-linux-tdep.o \
diff --git a/util/crossgcc/patches/gdb-7.9.1_no-doc.patch b/util/crossgcc/patches/gdb-7.9.1_no-doc.patch
deleted file mode 100644
index 156337a..0000000
--- a/util/crossgcc/patches/gdb-7.9.1_no-doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gdb-7.9.1/gdb/Makefile.in gdb-7.9.1/gdb/Makefile.in
---- gdb-7.9.1/gdb/Makefile.in	2015-05-13 10:36:05.000000000 -0700
-+++ gdb-7.9.1/gdb/Makefile.in	2015-06-09 13:22:53.594505278 -0700
-@@ -1065,7 +1065,7 @@
- 
- TSOBS = inflow.o
- 
--SUBDIRS = doc @subdirs@ data-directory $(GNULIB_BUILDDIR)
-+SUBDIRS = @subdirs@ data-directory $(GNULIB_BUILDDIR)
- CLEANDIRS = $(SUBDIRS)
- 
- # List of subdirectories in the build tree that must exist.
diff --git a/util/crossgcc/patches/gdb-7.9.1_pythonhome.patch b/util/crossgcc/patches/gdb-7.9.1_pythonhome.patch
deleted file mode 100644
index 7e34c7a..0000000
--- a/util/crossgcc/patches/gdb-7.9.1_pythonhome.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur gdb-7.9.1/gdb/python/python.c gdb-7.9.1.patched/gdb/python/python.c
---- gdb-7.9.1/gdb/python/python.c	2015-05-13 10:36:05.000000000 -0700
-+++ gdb-7.9.1.patched/gdb/python/python.c	2015-06-09 13:13:24.824178760 -0700
-@@ -1681,6 +1681,15 @@
- #endif
- #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.9.1_sim-arange.patch b/util/crossgcc/patches/gdb-7.9.1_sim-arange.patch
deleted file mode 100644
index bf56c2d..0000000
--- a/util/crossgcc/patches/gdb-7.9.1_sim-arange.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Mike Frysinger <vapier at gentoo dot org>
-
-With newer versions of gcc (5.x), the extern inline we're using with the
-sim-arange module no longer works.  Since this code really wants the gnu
-inline semantics, use that attribute explicitly.
-
-Reported-by: DJ Delorie <dj at redhat.com>
-Reported-by: Joel Sherrill <joel.sherrill at oarcorp.com>
-
-diff -urN gdb-7.9.1.orig/sim/common/sim-arange.h gdb-7.9.1/sim/common/sim-arange.h
---- gdb-7.9.1.orig/sim/common/sim-arange.h	2015-05-13 10:36:05.000000000 -0700
-+++ gdb-7.9.1/sim/common/sim-arange.h	2016-02-27 12:22:58.090512073 -0800
-@@ -60,22 +60,26 @@
- 				   address_word /*start*/,
- 				   address_word /*end*/);
- 
-+/* TODO: This should get moved into sim-inline.h.  */
-+#ifdef HAVE_INLINE
-+#ifdef SIM_ARANGE_C
-+#define SIM_ARANGE_INLINE INLINE
-+#else
-+#define SIM_ARANGE_INLINE EXTERN_INLINE
-+#endif
-+#else
-+#define SIM_ARANGE_INLINE EXTERN
-+#endif
-+
- /* Return non-zero if ADDR is in range AR, traversing the entire tree.
-    If no range is specified, that is defined to mean "everything".  */
--extern INLINE int
-+SIM_ARANGE_INLINE int
- sim_addr_range_hit_p (ADDR_RANGE * /*ar*/, address_word /*addr*/);
- #define ADDR_RANGE_HIT_P(ar, addr) \
-   ((ar)->range_tree == NULL || sim_addr_range_hit_p ((ar), (addr)))
- 
- #ifdef HAVE_INLINE
--#ifdef SIM_ARANGE_C
--#define SIM_ARANGE_INLINE INLINE
--#else
--#define SIM_ARANGE_INLINE EXTERN_INLINE
--#endif
- #include "sim-arange.c"
--#else
--#define SIM_ARANGE_INLINE
- #endif
- #define SIM_ARANGE_C_INCLUDED
- 
-diff -urN gdb-7.9.1.orig/sim/common/sim-inline.h gdb-7.9.1/sim/common/sim-inline.h
---- gdb-7.9.1.orig/sim/common/sim-inline.h	2015-05-13 10:36:05.000000000 -0700
-+++ gdb-7.9.1/sim/common/sim-inline.h	2016-02-27 12:23:58.169085087 -0800
-@@ -303,7 +303,9 @@
- /* ??? Temporary, pending decision to always use extern inline and do a vast
-    cleanup of inline support.  */
- #ifndef INLINE2
--#if defined (__GNUC__)
-+#if defined (__GNUC_GNU_INLINE__) || defined (__GNUC_STDC_INLINE__)
-+#define INLINE2 __inline__ __attribute__ ((__gnu_inline__))
-+#elif defined (__GNUC__)
- #define INLINE2 __inline__
- #else
- #define INLINE2 /*inline*/
diff --git a/util/crossgcc/sum/expat-2.1.0.tar.gz.cksum b/util/crossgcc/sum/expat-2.1.0.tar.gz.cksum
deleted file mode 100644
index 23ee87a..0000000
--- a/util/crossgcc/sum/expat-2.1.0.tar.gz.cksum
+++ /dev/null
@@ -1 +0,0 @@
-b08197d146930a5543a7b99e871cba3da614f6f0  tarballs/expat-2.1.0.tar.gz
diff --git a/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum b/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum
new file mode 100644
index 0000000..882e501
--- /dev/null
+++ b/util/crossgcc/sum/expat-2.1.1.tar.bz2.cksum
@@ -0,0 +1 @@
+ff91419882ac52151050dad0ee8190645fbeee08  tarballs/expat-2.1.1.tar.bz2
diff --git a/util/crossgcc/sum/gdb-7.11.tar.xz.cksum b/util/crossgcc/sum/gdb-7.11.tar.xz.cksum
new file mode 100644
index 0000000..ffe5a1c
--- /dev/null
+++ b/util/crossgcc/sum/gdb-7.11.tar.xz.cksum
@@ -0,0 +1 @@
+466208d771d97d3dfcf965d5c835a669cff8d847  tarballs/gdb-7.11.tar.xz
diff --git a/util/crossgcc/sum/gdb-7.9.1.tar.xz.cksum b/util/crossgcc/sum/gdb-7.9.1.tar.xz.cksum
deleted file mode 100644
index c926408..0000000
--- a/util/crossgcc/sum/gdb-7.9.1.tar.xz.cksum
+++ /dev/null
@@ -1 +0,0 @@
-04ba2906279b16b5f99c4f6b25942843a3717cdb  tarballs/gdb-7.9.1.tar.xz



More information about the coreboot-gerrit mailing list