| Brad Bishop | c68388fc | 2019-08-26 01:33:31 -0400 | [diff] [blame] | 1 | From 83bcd4cc47ae63971c888c117abd00dfd506532c Mon Sep 17 00:00:00 2001 |
| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 20 Feb 2015 11:17:19 +0000 |
| Brad Bishop | c68388fc | 2019-08-26 01:33:31 -0400 | [diff] [blame] | 4 | Subject: [PATCH 20/36] gcc 4.8+ won't build with --disable-dependency-tracking |
| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 5 | |
| 6 | since the *.Ppo files don't get created unless --enable-dependency-tracking is true. |
| 7 | |
| 8 | This patch ensures we only use those compiler options when its enabled. |
| 9 | |
| 10 | Upstream-Status: Submitted |
| 11 | |
| 12 | (Problem was already reported upstream, attached this patch there |
| 13 | http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55930) |
| 14 | |
| 15 | RP |
| 16 | 2012/09/22 |
| 17 | |
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 19 | --- |
| 20 | libatomic/Makefile.am | 3 ++- |
| 21 | libatomic/Makefile.in | 3 ++- |
| 22 | 2 files changed, 4 insertions(+), 2 deletions(-) |
| 23 | |
| 24 | diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am |
| 25 | index c1b7c73934a..ef43d62c07a 100644 |
| 26 | --- a/libatomic/Makefile.am |
| 27 | +++ b/libatomic/Makefile.am |
| 28 | @@ -101,7 +101,8 @@ PAT_S = $(word 3,$(PAT_SPLIT)) |
| 29 | IFUNC_DEF = -DIFUNC_ALT=$(PAT_S) |
| 30 | IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS)) |
| 31 | |
| 32 | -M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo |
| 33 | +@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo |
| 34 | +@AMDEP_FALSE@M_DEPS = |
| 35 | M_SIZE = -DN=$(PAT_N) |
| 36 | M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT)) |
| 37 | M_FILE = $(PAT_BASE)_n.c |
| 38 | diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in |
| 39 | index 29324e3e0ac..d5cdb4259ef 100644 |
| 40 | --- a/libatomic/Makefile.in |
| 41 | +++ b/libatomic/Makefile.in |
| 42 | @@ -414,7 +414,8 @@ PAT_N = $(word 2,$(PAT_SPLIT)) |
| 43 | PAT_S = $(word 3,$(PAT_SPLIT)) |
| 44 | IFUNC_DEF = -DIFUNC_ALT=$(PAT_S) |
| 45 | IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS)) |
| 46 | -M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo |
| 47 | +@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo |
| 48 | +@AMDEP_FALSE@M_DEPS = |
| 49 | M_SIZE = -DN=$(PAT_N) |
| 50 | M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT)) |
| 51 | M_FILE = $(PAT_BASE)_n.c |
| 52 | -- |
| Brad Bishop | c68388fc | 2019-08-26 01:33:31 -0400 | [diff] [blame] | 53 | 2.22.1 |
| Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 54 | |