Re: [PATCH 2/3] perf tools: Fix build for hardened environments

From: Jiri Olsa
Date: Mon Dec 04 2017 - 03:24:49 EST


On Mon, Dec 04, 2017 at 08:34:31AM +0100, Jiri Olsa wrote:
> On Fri, Dec 01, 2017 at 11:11:37AM +0900, Namhyung Kim wrote:
> > Hi Jiri,
> >
> > On Wed, Nov 08, 2017 at 11:27:38AM +0100, Jiri Olsa wrote:
> > > From: Jiri Olsa <jolsa@xxxxxxxxxx>
> > >
> > > On Fedora systems the perl and python CFLAGS/LDFLAGS include the
> > > hardened specs from redhat-rpm-config package. We apply them only
> > > for perl/python objects, which makes them not compatible with the
> > > rest of the objects and the build fails with:
> > >
> > > /usr/bin/ld: perf-in.o: relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a shared object; recompile with -fPIC
> > > /usr/bin/ld: libperf.a(libperf-in.o): relocation R_X86_64_32S against `.text' can not be used when making a shared object; recompile with -fPIC
> > > /usr/bin/ld: final link failed: Nonrepresentable section on output
> > > collect2: error: ld returned 1 exit status
> > > make[2]: *** [Makefile.perf:507: perf] Error 1
> > > make[1]: *** [Makefile.perf:210: sub-make] Error 2
> > > make: *** [Makefile:69: all] Error 2
> > >
> > > Mainly it's caused by perl/python objects being compiled with:
> > >
> > > -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1
> > >
> > > which prevent the final link impossible, because it will check
> > > for 'proper' objects with following option:
> > >
> > > -specs=/usr/lib/rpm/redhat/redhat-hardened-ld
> >
> > Just for curiousity, could you please show me the contents of the two
> > files? (Are they big?)
>
> # cat /usr/lib/rpm/redhat/redhat-hardened-ld
> *self_spec:
> + %{!static:%{!shared:%{!r:-pie}}}
>
> *link:
> + -z now
>
>
> # cat /usr/lib/rpm/redhat/redhat-hardened-cc1
> *cc1_options:
> + %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}}


looks like we could remove that spec totaly and get things working
we already do that for CC_NO_CLANG

could you guys test patch below? works on my setup

thanks,
jirka


---
tools/perf/Makefile.config | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index c17472cb50f5..d702d21eacf6 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -184,9 +184,7 @@ ifdef PYTHON_CONFIG
PYTHON_EMBED_LDFLAGS := $(call strip-libs,$(PYTHON_EMBED_LDOPTS))
PYTHON_EMBED_LIBADD := $(call grep-libs,$(PYTHON_EMBED_LDOPTS)) -lutil
PYTHON_EMBED_CCOPTS := $(shell $(PYTHON_CONFIG_SQ) --cflags 2>/dev/null)
- ifeq ($(CC_NO_CLANG), 1)
- PYTHON_EMBED_CCOPTS := $(filter-out -specs=%,$(PYTHON_EMBED_CCOPTS))
- endif
+ PYTHON_EMBED_CCOPTS := $(filter-out -specs=%,$(PYTHON_EMBED_CCOPTS))
FLAGS_PYTHON_EMBED := $(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)
endif

@@ -572,7 +570,6 @@ ifndef NO_GTK2
endif
endif

-
ifdef NO_LIBPERL
CFLAGS += -DNO_LIBPERL
else
@@ -580,6 +577,8 @@ else
PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS))
PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS))
PERL_EMBED_CCOPTS = $(shell perl -MExtUtils::Embed -e ccopts 2>/dev/null)
+ PERL_EMBED_CCOPTS := $(filter-out -specs=%,$(PERL_EMBED_CCOPTS))
+ PERL_EMBED_LDOPTS := $(filter-out -specs=%,$(PERL_EMBED_LDOPTS))
FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)

ifneq ($(feature-libperl), 1)
--
2.14.3