[meego-packaging] 4961: Changes to devel:base/gcc

[Austin Zhang]

Hi,
I have made the following changes to gcc in project devel:base. Please review and accept ASAP.

Thank You,
Austin Zhang

[This message was auto-generated]

---

Request #4961:

  submit:   home:austin:branches:devel:base/gcc(r2)(cleanup) -> devel:base/gcc


Message:
    Fixed packing issue of libgcc_s.so and use-atom patch arch string

State:   new          2010-06-28T05:23:21 austin
Comment: None



changes files:
--------------
--- gcc.changes
+++ gcc.changes
@@ -0,0 +1,4 @@
+* Tue Jun 29 2010 Austin Zhang <austin.zhang at intel.com> - 4.5.0
+- Fixed packing issue of symbolic link of libgcc_s.so
+- Fixed gcc45-use-atom arch string
+

spec files:
-----------
--- cross-armv5tel-gcc-accel.spec
+++ cross-armv5tel-gcc-accel.spec
@@ -1384,7 +1384,7 @@
 %files -n libgcc
 %defattr(-,root,root,-)
 /%{_lib}/libgcc_s-%{gcc_version}.so.1
-/%{_lib}/libgcc_s.*
+/%{_libdir}/libgcc_s.*
 %{_prefix}/sbin/libgcc_post_upgrade
 %doc gcc/COPYING.LIB
 
--- cross-armv5tel-gcc.spec
+++ cross-armv5tel-gcc.spec
@@ -1384,7 +1384,7 @@
 %files -n libgcc
 %defattr(-,root,root,-)
 /%{_lib}/libgcc_s-%{gcc_version}.so.1
-/%{_lib}/libgcc_s.*
+/%{_libdir}/libgcc_s.*
 %{_prefix}/sbin/libgcc_post_upgrade
 %doc gcc/COPYING.LIB
 
--- cross-armv7l-gcc-accel.spec
+++ cross-armv7l-gcc-accel.spec
@@ -1384,7 +1384,7 @@
 %files -n libgcc
 %defattr(-,root,root,-)
 /%{_lib}/libgcc_s-%{gcc_version}.so.1
-/%{_lib}/libgcc_s.*
+/%{_libdir}/libgcc_s.*
 %{_prefix}/sbin/libgcc_post_upgrade
 %doc gcc/COPYING.LIB
 
--- cross-armv7l-gcc.spec
+++ cross-armv7l-gcc.spec
@@ -1384,7 +1384,7 @@
 %files -n libgcc
 %defattr(-,root,root,-)
 /%{_lib}/libgcc_s-%{gcc_version}.so.1
-/%{_lib}/libgcc_s.*
+/%{_libdir}/libgcc_s.*
 %{_prefix}/sbin/libgcc_post_upgrade
 %doc gcc/COPYING.LIB
 
--- gcc.spec
+++ gcc.spec
@@ -522,8 +522,7 @@
 %patch29 -p0 -b .libstdc++-docs~
 %endif
 
-#Fix me!
-#%patch40 -p1 -b .atom
+%patch40 -p1 -b .atom
 
 #%patch42 -p0 -b .var-track1~
 #%patch43 -p0 -b .var-track2~
@@ -1385,6 +1384,7 @@
 %defattr(-,root,root,-)
 /%{_lib}/libgcc_s-%{gcc_version}.so.1
 /%{_lib}/libgcc_s.*
+/%{_libdir}/libgcc_s.*
 %{_prefix}/sbin/libgcc_post_upgrade
 %doc gcc/COPYING.LIB
 

other changes:
--------------

++++++ gcc45-use-atom.patch
--- gcc45-use-atom.patch
+++ gcc45-use-atom.patch
@@ -55,7 +55,7 @@
  	       ix86_stringop_string, prefix, suffix, sw);
      }
  
-+  ix86_arch_string = "atom";
++  ix86_arch_string = "core2";
    if (!ix86_arch_string)
      ix86_arch_string = TARGET_64BIT ? "x86-64" : SUBTARGET32_DEFAULT_CPU;
    else