All of lore.kernel.org
 help / color / mirror / Atom feed
From: Waldemar Brodkorb <wbx@openadk.org>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] gdb: fix sim support for ARM
Date: Sun, 31 Jul 2016 13:27:51 +0200	[thread overview]
Message-ID: <20160731112751.GA26681@waldemar-brodkorb.de> (raw)

It seems the old fix breaks compilation for other
architectures then bfin.
Fixes:
http://autobuild.buildroot.net/results/3b82c44ee853fab0e0c63881f0705bb659412917/
http://autobuild.buildroot.net/results/dafbb93ab38a4285ce42436219d552cceb14828b/

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---

@Thomas Petazzoni: Can you check if it still works on your old
Debian system with gcc 4.4 on the host. Thanks.

---
 package/gdb/7.10.1/0005-fix-sim-compile.patch |   16 ----------------
 package/gdb/7.10.1/0006-fix-sim-compile.patch |   22 ++++++++++++++++++++++
 package/gdb/7.11.1/0001-fix-sim-compile.patch |   18 ++++++++++++------
 3 files changed, 34 insertions(+), 22 deletions(-)
 delete mode 100644 package/gdb/7.10.1/0005-fix-sim-compile.patch
 create mode 100644 package/gdb/7.10.1/0006-fix-sim-compile.patch

diff --git a/package/gdb/7.10.1/0005-fix-sim-compile.patch b/package/gdb/7.10.1/0005-fix-sim-compile.patch
deleted file mode 100644
index c886363..0000000
--- a/package/gdb/7.10.1/0005-fix-sim-compile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix compile on older systems with gcc 4.4.x.
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gdb-7.10.1.orig//sim/common/sim-base.h gdb-7.10.1/sim/common/sim-base.h
---- gdb-7.10.1.orig//sim/common/sim-base.h	2015-05-13 13:03:56.000000000 -0500
-+++ gdb-7.10.1/sim/common/sim-base.h	2016-07-08 07:44:17.000000000 -0500
-@@ -72,8 +72,6 @@
- #define INVALID_INSTRUCTION_ADDRESS ((address_word)0 - 1)
- #endif
- 
--/* TODO: Probably should just delete SIM_CPU.  */
--typedef struct _sim_cpu SIM_CPU;
- typedef struct _sim_cpu sim_cpu;
- 
- #include "sim-module.h"
diff --git a/package/gdb/7.10.1/0006-fix-sim-compile.patch b/package/gdb/7.10.1/0006-fix-sim-compile.patch
new file mode 100644
index 0000000..4d365b9
--- /dev/null
+++ b/package/gdb/7.10.1/0006-fix-sim-compile.patch
@@ -0,0 +1,22 @@
+Fix compile on older systems with gcc 4.4.x.
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+diff -Nur gdb-7.10.1.orig/sim/common/sim-base.h gdb-7.10.1/sim/common/sim-base.h
+--- gdb-7.10.1.orig/sim/common/sim-base.h	2015-05-13 20:03:56.000000000 +0200
++++ gdb-7.10.1/sim/common/sim-base.h	2016-07-31 12:37:36.103814690 +0200
+@@ -72,8 +72,13 @@
+ #define INVALID_INSTRUCTION_ADDRESS ((address_word)0 - 1)
+ #endif
+ 
+-/* TODO: Probably should just delete SIM_CPU.  */
++/* GCC 4.4 and older should not define this.  */
++#define GCC_VERSION (__GNUC__ * 10000 \
++                               + __GNUC_MINOR__ * 100 \
++                               + __GNUC_PATCHLEVEL__)
++#if __GCC_VERSION > 40400
+ typedef struct _sim_cpu SIM_CPU;
++#endif
+ typedef struct _sim_cpu sim_cpu;
+ 
+ #include "sim-module.h"
diff --git a/package/gdb/7.11.1/0001-fix-sim-compile.patch b/package/gdb/7.11.1/0001-fix-sim-compile.patch
index ecb0514..4d365b9 100644
--- a/package/gdb/7.11.1/0001-fix-sim-compile.patch
+++ b/package/gdb/7.11.1/0001-fix-sim-compile.patch
@@ -1,16 +1,22 @@
-Fix compile on older systems with gcc 4.4.x
+Fix compile on older systems with gcc 4.4.x.
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur gdb-7.11.1.orig//sim/common/sim-base.h gdb-7.11.1/sim/common/sim-base.h
---- gdb-7.11.1.orig//sim/common/sim-base.h	2016-02-09 21:19:39.000000000 -0600
-+++ gdb-7.11.1/sim/common/sim-base.h	2016-07-08 08:02:09.000000000 -0500
-@@ -72,8 +72,6 @@
+diff -Nur gdb-7.10.1.orig/sim/common/sim-base.h gdb-7.10.1/sim/common/sim-base.h
+--- gdb-7.10.1.orig/sim/common/sim-base.h	2015-05-13 20:03:56.000000000 +0200
++++ gdb-7.10.1/sim/common/sim-base.h	2016-07-31 12:37:36.103814690 +0200
+@@ -72,8 +72,13 @@
  #define INVALID_INSTRUCTION_ADDRESS ((address_word)0 - 1)
  #endif
  
 -/* TODO: Probably should just delete SIM_CPU.  */
--typedef struct _sim_cpu SIM_CPU;
++/* GCC 4.4 and older should not define this.  */
++#define GCC_VERSION (__GNUC__ * 10000 \
++                               + __GNUC_MINOR__ * 100 \
++                               + __GNUC_PATCHLEVEL__)
++#if __GCC_VERSION > 40400
+ typedef struct _sim_cpu SIM_CPU;
++#endif
  typedef struct _sim_cpu sim_cpu;
  
  #include "sim-module.h"
-- 
1.7.10.4

             reply	other threads:[~2016-07-31 11:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-31 11:27 Waldemar Brodkorb [this message]
2016-08-01 21:23 ` [Buildroot] [PATCH] gdb: fix sim support for ARM Romain Naour
2016-08-04 22:20 ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160731112751.GA26681@waldemar-brodkorb.de \
    --to=wbx@openadk.org \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.