[rtems-crossrpms commit] Preps for cygwin-gcc-4.8.x

[Ralf Corsepius]

Module:    rtems-crossrpms
Branch:    master
Commit:    fb1797bf6e86dc6800a5b269bbaaeddd09e1d68d
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=fb1797bf6e86dc6800a5b269bbaaeddd09e1d68d

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Sat Feb  8 07:40:43 2014 +0100

Preps for cygwin-gcc-4.8.x

---

 gcc/build.add   |    1 +
 gcc/install.add |   10 ++++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/gcc/build.add b/gcc/build.add
index cedaf4a..c73cd59 100644
--- a/gcc/build.add
+++ b/gcc/build.add
@@ -55,6 +55,7 @@
     --with-sysroot=%{_exec_prefix}/@tool_target@/sys-root \
     %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \
     %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \
+    %{?gcc_options:%gcc_options} \
 %if %build_newlib
     --enable-newlib-io-c99-formats \
     %{?with_iconv:--enable-newlib-iconv} \
diff --git a/gcc/install.add b/gcc/install.add
index b7f5b10..52790ec 100644
--- a/gcc/install.add
+++ b/gcc/install.add
@@ -93,6 +93,15 @@
 %endif
 
 %endif
+%if "@tool_target@" == "x86_64-pc-cygwin"
+  mv "${RPM_BUILD_ROOT}"%{_gcclibdir}/gcc/@tool_target@/cyggcc_s-seh-1.dll \
+    "${RPM_BUILD_ROOT}"%{_gcclibdir}/gcc/@tool_target@/lib/libgcc_s.dll.a \
+    "${RPM_BUILD_ROOT}"%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
+%endif
+%if "@tool_target@" == "i686-pc-cygwin"
+  mv "${RPM_BUILD_ROOT}"%{_gcclibdir}/gcc/@tool_target@/cyggcc_s-1.dll \
+    "${RPM_BUILD_ROOT}"%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}
+%endif
   # Collect multilib subdirectories
   multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
@@ -168,6 +177,7 @@
     %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now
     %{?with_pygdb:*/libstdc++*gdb.py*) >> build/files.g++ ;;}
     */libstdc++.*) echo "$i" >> build/files.g++ ;;
+    */cygstdc++*.dll) echo "$i" >> build/files.g++ ;;
     */libsupc++.*) echo "$i" >> build/files.g++ ;;
     *) echo "$i" >> build/files.gcc ;;
     esac