Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / ea144b037776e892b9e05c4d22be842901e2138c / . / meta-arm / meta-arm-toolchain / recipes-devtools / gcc / gcc-arm-12.2 / 0015-libcc1-fix-libcc1-s-install-path-and-rpath.patch
blob: ce9635ce4dd84cd6cc5043fe1d7c6d5534644eeb [file] [log] [blame]
Andrew Geisslerea144b032023-01-27 16:03:57 -0600[diff] [blame^]1From bf918db7117f41d3c04162095641165ca241707d Mon Sep 17 00:00:00 2001
Brad Bishopbec4ebc2022-08-03 09:55:16 -0400[diff] [blame]2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sun, 5 Jul 2015 20:25:18 -0700
4Subject: [PATCH] libcc1: fix libcc1's install path and rpath
5
6* Install libcc1.so and libcc1plugin.so into
7 $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we
8 had done to lto-plugin.
9* Fix bad RPATH iussue:
10 gcc-5.2.0: package gcc-plugins contains bad RPATH /patht/to/tmp/sysroots/qemux86-64/usr/lib64/../lib64 in file
11 /path/to/gcc/5.2.0-r0/packages-split/gcc-plugins/usr/lib64/gcc/x86_64-poky-linux/5.2.0/plugin/libcc1plugin.so.0.0.0
12 [rpaths]
13
14Upstream-Status: Inappropriate [OE configuration]
15
16Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
17---
18 libcc1/Makefile.am | 4 ++--
19 libcc1/Makefile.in | 4 ++--
20 2 files changed, 4 insertions(+), 4 deletions(-)
21
22diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am
Andrew Geisslerea144b032023-01-27 16:03:57 -0600[diff] [blame^]23index 6e3a34ff7e2..3f3f6391aba 100644
Brad Bishopbec4ebc2022-08-03 09:55:16 -0400[diff] [blame]24--- a/libcc1/Makefile.am
25+++ b/libcc1/Makefile.am
Andrew Geisslerea144b032023-01-27 16:03:57 -0600[diff] [blame^]26@@ -40,8 +40,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
Brad Bishopbec4ebc2022-08-03 09:55:16 -0400[diff] [blame]27 $(Wc)$(libiberty_normal)))
28 libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty))
29
30-plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin
31-cc1libdir = $(libdir)/$(libsuffix)
32+cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
33+plugindir = $(cc1libdir)
34
35 if ENABLE_PLUGIN
36 plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la
37diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in
Andrew Geisslerea144b032023-01-27 16:03:57 -0600[diff] [blame^]38index f8f590d71e9..56462492045 100644
Brad Bishopbec4ebc2022-08-03 09:55:16 -0400[diff] [blame]39--- a/libcc1/Makefile.in
40+++ b/libcc1/Makefile.in
Andrew Geisslerea144b032023-01-27 16:03:57 -0600[diff] [blame^]41@@ -396,8 +396,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
Brad Bishopbec4ebc2022-08-03 09:55:16 -0400[diff] [blame]42 $(Wc)$(libiberty_normal)))
43
44 libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty))
45-plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin
46-cc1libdir = $(libdir)/$(libsuffix)
47+cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
48+plugindir = $(cc1libdir)
49 @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la
50 @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la
51 shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \