diff options
| author | Nikolay Bozhenov <n.bozhenov@samsung.com> | 2015-04-08 13:02:40 +0300 |
|---|---|---|
| committer | Dongkyun Son <dongkyun.s@samsung.com> | 2015-06-04 04:55:08 -0700 |
| commit | 75b13a503145c9c3893405c32fb0e69b7d8ccb67 (patch) | |
| tree | 9cd23a9860a7d900a26cc44302e6a2776b5f6deb | |
| parent | ca15d11e5aeb129c33aff377b8ca05df5f44c12d (diff) | |
| download | binutils-75b13a503145c9c3893405c32fb0e69b7d8ccb67.tar.gz binutils-75b13a503145c9c3893405c32fb0e69b7d8ccb67.tar.bz2 binutils-75b13a503145c9c3893405c32fb0e69b7d8ccb67.zip | |
Hardcode host-specific name for LTO pluginHEADtizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_wearable/20150617.000001submit/tizen_tv/20150617.000001submit/tizen_mobile/20150617.000001submit/tizen_common/20150617.082114submit/tizen_base/20151223.111112submit/tizen_base/20151223.111111submit/tizen_3.0.2015.q2_common/20150617.082128accepted/tizen/wearable/20150618.093518accepted/tizen/tv/20150618.103536accepted/tizen/mobile/20150618.112654accepted/tizen/common/20150617.115454accepted/tizen/base/20151223.052217accepted/tizen/3.0.2015.q2/common/20150617.115425tizen_base_oldtizen_3.0.m1_tvtizen_3.0.m1_mobiletizen_3.0.2015.q2_commontizenaccepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_commonaccepted/tizen_3.0.2015.q2_common
Otherwise, binutils can try to use plugin for different architecture.
Change-Id: I3070e774ec7f8494241fe52b7aee6d3ba3acef06
| -rw-r--r-- | bfd/plugin.c | 8 | ||||
| -rw-r--r-- | packaging/binutils.spec | 1 | ||||
| -rw-r--r-- | packaging/cross-aarch64-binutils.spec | 1 | ||||
| -rw-r--r-- | packaging/cross-arm-binutils.spec | 1 | ||||
| -rw-r--r-- | packaging/cross-i386-binutils.spec | 1 |
5 files changed, 12 insertions, 0 deletions
diff --git a/bfd/plugin.c b/bfd/plugin.c index a068861641c..f30eadef4c1 100644 --- a/bfd/plugin.c +++ b/bfd/plugin.c @@ -295,6 +295,14 @@ load_plugin (bfd *abfd) char *full_name; struct stat s; +#ifdef BFD_PLUGIN_LTO_NAME +#define STRINGIFY(x) STRINGIFY_(x) +#define STRINGIFY_(x) #x + if (strcmp(ent->d_name, STRINGIFY(BFD_PLUGIN_LTO_NAME))) { + continue; + } +#endif + full_name = concat (p, "/", ent->d_name, NULL); if (stat(full_name, &s) == 0 && S_ISREG (s.st_mode)) found = try_load_plugin (full_name, abfd); diff --git a/packaging/binutils.spec b/packaging/binutils.spec index ea297c61e59..93759a73860 100644 --- a/packaging/binutils.spec +++ b/packaging/binutils.spec @@ -105,6 +105,7 @@ ulimit -s unlimited sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h %build +RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DBFD_PLUGIN_LTO_NAME=liblto_plugin_%{_arch}.so" RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS |sed -e 's/atom/i686/g'` %if 0%{!?cross:1} diff --git a/packaging/cross-aarch64-binutils.spec b/packaging/cross-aarch64-binutils.spec index b37beecde84..b3d12264865 100644 --- a/packaging/cross-aarch64-binutils.spec +++ b/packaging/cross-aarch64-binutils.spec @@ -106,6 +106,7 @@ ulimit -s unlimited sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h %build +RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DBFD_PLUGIN_LTO_NAME=liblto_plugin_%{_arch}.so" RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS |sed -e 's/atom/i686/g'` %if 0%{!?cross:1} diff --git a/packaging/cross-arm-binutils.spec b/packaging/cross-arm-binutils.spec index 461b208ceaf..0b00125372f 100644 --- a/packaging/cross-arm-binutils.spec +++ b/packaging/cross-arm-binutils.spec @@ -106,6 +106,7 @@ ulimit -s unlimited sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h %build +RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DBFD_PLUGIN_LTO_NAME=liblto_plugin_%{_arch}.so" RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS |sed -e 's/atom/i686/g'` %if 0%{!?cross:1} diff --git a/packaging/cross-i386-binutils.spec b/packaging/cross-i386-binutils.spec index 05fd06c8dba..12e80194c3e 100644 --- a/packaging/cross-i386-binutils.spec +++ b/packaging/cross-i386-binutils.spec @@ -106,6 +106,7 @@ ulimit -s unlimited sed -i -e '/BFD_VERSION_DATE/s/$/-%(echo %release | sed 's/\.[0-9]*$//')/' bfd/version.h %build +RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DBFD_PLUGIN_LTO_NAME=liblto_plugin_%{_arch}.so" RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-error" RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS |sed -e 's/atom/i686/g'` %if 0%{!?cross:1} |