summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Kashkarov <m.kashkarov@partner.samsung.com>2019-05-24 17:06:20 +0300
committerMikhail Kashkarov <m.kashkarov@partner.samsung.com>2019-09-04 17:10:31 +0300
commit077ede6059ffbc0a768ca1b9b180194d96b348c8 (patch)
treed82f3bb1c39bdad2448e186591c369707118f7f7
parent1359e4dbfecabab05500d06a8621919150a6dc38 (diff)
downloadqemu-accel-077ede6059ffbc0a768ca1b9b180194d96b348c8.tar.gz
qemu-accel-077ede6059ffbc0a768ca1b9b180194d96b348c8.tar.bz2
qemu-accel-077ede6059ffbc0a768ca1b9b180194d96b348c8.zip
Fix aarch64 acceleration for gcc compilers/wrappers
libdir defined in this spec as: %define libdir %{_prefix}/lib%{?aarch64:64} This changes the following symbolic links: /emul/home/abuild/rpmbuild/BUILD/gcc-6.2.1/obj/gcc/{cc1,cc1plus,collect2,f951,lto-wrapper,lto1} before: /emul/home/abuild/rpmbuild/BUILD/gcc-6.2.1/obj/gcc/cc1 -> /emul/usr/lib/gcc/aarch64-tizen-linux-gnu/6.2.1/cc1 after: /emul/home/abuild/rpmbuild/BUILD/gcc-6.2.1/obj/gcc/cc1 -> /emul/usr/lib64/gcc/aarch64-tizen-linux-gnu/6.2.1/cc1 Where /usr/lib64/gcc/aarch64-tizen-linux-gnu/ is the real gcc-aarch64 directory. Change-Id: If1a1a5914b5d847bc28fdf5203b7c78c77453538
-rw-r--r--packaging/qemu-accel-aarch64.spec2
-rw-r--r--packaging/qemu-accel-armv7hl.spec2
-rw-r--r--packaging/qemu-accel-armv7l.spec2
-rw-r--r--packaging/qemu-accel.spec.in2
4 files changed, 4 insertions, 4 deletions
diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec
index 6c2ebbb..ffb0cd8 100644
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -403,7 +403,7 @@ do
done
for binary in cc1 cc1plus collect2 lto1 lto-wrapper f951
do
- ln -sf %{our_path}/usr/lib/gcc/%{target_arch}/${gcc_version}/${binary} %{buildroot}%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/${binary}
+ ln -sf %{our_path}%{libdir}/gcc/%{target_arch}/${gcc_version}/${binary} %{buildroot}%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/${binary}
echo "%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/${binary}" >> %{_sourcedir}/all-accel.list
done
ln -sf %{our_path}%{_bindir}/gcc %{buildroot}%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/xgcc
diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec
index 3b4626d..7c2c619 100644
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -403,7 +403,7 @@ do
done
for binary in cc1 cc1plus collect2 lto1 lto-wrapper f951
do
- ln -sf %{our_path}/usr/lib/gcc/%{target_arch}/${gcc_version}/${binary} %{buildroot}%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/${binary}
+ ln -sf %{our_path}%{libdir}/gcc/%{target_arch}/${gcc_version}/${binary} %{buildroot}%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/${binary}
echo "%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/${binary}" >> %{_sourcedir}/all-accel.list
done
ln -sf %{our_path}%{_bindir}/gcc %{buildroot}%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/xgcc
diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec
index a399ec8..031d8d7 100644
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -403,7 +403,7 @@ do
done
for binary in cc1 cc1plus collect2 lto1 lto-wrapper f951
do
- ln -sf %{our_path}/usr/lib/gcc/%{target_arch}/${gcc_version}/${binary} %{buildroot}%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/${binary}
+ ln -sf %{our_path}%{libdir}/gcc/%{target_arch}/${gcc_version}/${binary} %{buildroot}%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/${binary}
echo "%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/${binary}" >> %{_sourcedir}/all-accel.list
done
ln -sf %{our_path}%{_bindir}/gcc %{buildroot}%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/xgcc
diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in
index c3f9f98..9ef9bdd 100644
--- a/packaging/qemu-accel.spec.in
+++ b/packaging/qemu-accel.spec.in
@@ -400,7 +400,7 @@ do
done
for binary in cc1 cc1plus collect2 lto1 lto-wrapper f951
do
- ln -sf %{our_path}/usr/lib/gcc/%{target_arch}/${gcc_version}/${binary} %{buildroot}%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/${binary}
+ ln -sf %{our_path}%{libdir}/gcc/%{target_arch}/${gcc_version}/${binary} %{buildroot}%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/${binary}
echo "%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/${binary}" >> %{_sourcedir}/all-accel.list
done
ln -sf %{our_path}%{_bindir}/gcc %{buildroot}%{our_path}/home/abuild/rpmbuild/BUILD/gcc-${gcc_version}/obj/gcc/xgcc