gpsd: fix compile for microblaze arch

Message ID 20170813085926.GA13312@waldemar-brodkorb.de
State Accepted
Headers show

Commit Message

Waldemar Brodkorb Aug. 13, 2017, 8:59 a.m.
Disable O2 and add O0. The suggested flags in the gcc report
are not enough for gcc >= 6.

Fixes:
  http://autobuild.buildroot.net/results/368/3686cd3f3e7b6aee84f4377bd2dded1115321fb3/

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 package/gpsd/0002-do-not-append-O2.patch | 18 ++++++++++++++++++
 package/gpsd/gpsd.mk                     |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 package/gpsd/0002-do-not-append-O2.patch

Comments

Thomas Petazzoni Aug. 14, 2017, 9:31 p.m. | #1
Hello,

On Sun, 13 Aug 2017 10:59:26 +0200, Waldemar Brodkorb wrote:
> Disable O2 and add O0. The suggested flags in the gcc report
> are not enough for gcc >= 6.
> 
> Fixes:
>   http://autobuild.buildroot.net/results/368/3686cd3f3e7b6aee84f4377bd2dded1115321fb3/
> 
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> ---
>  package/gpsd/0002-do-not-append-O2.patch | 18 ++++++++++++++++++
>  package/gpsd/gpsd.mk                     |  2 +-
>  2 files changed, 19 insertions(+), 1 deletion(-)
>  create mode 100644 package/gpsd/0002-do-not-append-O2.patch

I've applied to master. However, before doing this, I had to reformat
the patch using Git, and improve the patch description, which was a bit
too terse: it was only saying what the patch is doing (which is obvious
by reading the patch), but not *why* you're doing it.

Also, please use Git to format patches when the upstream project is
hosted in Git.

Thanks!

Thomas
Peter Korsgaard Sept. 6, 2017, 9:04 a.m. | #2
>>>>> "Waldemar" == Waldemar Brodkorb <wbx@openadk.org> writes:

 > Disable O2 and add O0. The suggested flags in the gcc report
 > are not enough for gcc >= 6.

 > Fixes:
 >   http://autobuild.buildroot.net/results/368/3686cd3f3e7b6aee84f4377bd2dded1115321fb3/

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

Committed to 2017.02.x, thanks.

Patch

diff --git a/package/gpsd/0002-do-not-append-O2.patch b/package/gpsd/0002-do-not-append-O2.patch
new file mode 100644
index 000000000..585c82835
--- /dev/null
+++ b/package/gpsd/0002-do-not-append-O2.patch
@@ -0,0 +1,18 @@ 
+Disable default O2 passing
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+diff -Nur gpsd-3.16.orig/SConstruct gpsd-3.16/SConstruct
+--- gpsd-3.16.orig/SConstruct	2016-01-08 20:25:48.000000000 +0100
++++ gpsd-3.16/SConstruct	2017-08-13 10:42:14.082794656 +0200
+@@ -330,9 +330,7 @@
+     # Should we build with optimisation?
+     if env['debug'] or env['coveraging']:
+         env.Append(CCFLAGS=['-O0'])
+-    else:
+-        env.Append(CCFLAGS=['-O2'])
+-
++#
+ # Get a slight speedup by not doing automatic RCS and SCCS fetches.
+ env.SourceCode('.', None)
+ 
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 552d6d936..2b9c38a42 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -44,7 +44,7 @@  endif
 # A bug was reported to the gcc bug tracker:
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68485
 ifeq ($(BR2_microblaze),y)
-GPSD_CFLAGS += -fno-expensive-optimizations -fno-schedule-insns
+GPSD_CFLAGS += -O0
 endif
 
 # Enable or disable Qt binding