diff --git a/gcc/PKGBUILD b/gcc/PKGBUILD
index 0b7f9df9..766cf5f2 100644
--- a/gcc/PKGBUILD
+++ b/gcc/PKGBUILD
@@ -45,7 +45,8 @@ source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
 		gcc-4.8.0-libgcc-msys64.patch
 		gcc-4.8.0-msys2-spec.patch
 		gcc-4.8.0-testsuite-msys2.patch
-		4.8-libgcc-references.patch)
+		4.8-libgcc-references.patch
+		gcc-4.8.2-1.src.patch)
 md5sums=('a3d7d63b9cb6b6ea049469a0c4a43c9d'
          '40cb437805e2f7a006aa0d0c3098ab0f'
          '741e079f5ec80aee1a552d0ec0b74575'
@@ -75,7 +76,8 @@ md5sums=('a3d7d63b9cb6b6ea049469a0c4a43c9d'
          '8939d9e1a18a1181bbb95da8efb8e98f'
          'c9fb65c97643807fcee2f21e897b5ed7'
          '3d6ec97347c5a57f46610a93bbd724a8'
-         '928e151b33981e68d0e67a9bd387b37e')
+         '928e151b33981e68d0e67a9bd387b37e'
+         '18d72148d7e9f4d0251fcdf41e6afa05')
 
 if [ -n "${_snapshot}" ]; then
   _basedir=gcc-${_snapshot}
@@ -191,10 +193,10 @@ build() {
   #make doc-man-doxygen
 }
 
-setup() {
-  cd ${srcdir}/gcc-build
-  make -j1 DESTDIR=${destdir} install
-}
+# setup() {
+  # cd ${srcdir}/gcc-build
+  # make -j1 DESTDIR=${destdir} install
+# }
 
 check() {
   cd ${srcdir}/gcc-build
@@ -247,8 +249,11 @@ package_gcc()
   cd ${srcdir}/gcc-build
   
   make -j1 DESTDIR=${pkgdir} install
-  mv $pkgdir/usr/lib/gcc/${CHOST}/lib/libgcc_s.dll.a $pkgdir/usr/lib/gcc/${CHOST}/${pkgver/-*/.*}/
-  rm -rf $pkgdir/usr/lib/gcc/${CHOST}/lib
+  if [ "$CARCH" = "x86_64" ]
+  then
+    mv $pkgdir/usr/lib/gcc/${CHOST}/lib/libgcc_s.dll.a $pkgdir/usr/lib/gcc/${CHOST}/${pkgver/-*/.*}/
+    rm -rf $pkgdir/usr/lib/gcc/${CHOST}/lib
+  fi
   #install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
   #mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py
 
diff --git a/gcc/gcc-4.8.2-1.cygwin.patch b/gcc/gcc-4.8.2-1.cygwin.patch
deleted file mode 100644
index 13940639..00000000
--- a/gcc/gcc-4.8.2-1.cygwin.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- origsrc/gcc-4.8.2/CYGWIN-PATCHES/fix-libtool-scripts-for-latest-gcc-runtimes.sh	1970-01-01 07:30:00.000000000 +0730
-+++ src/gcc-4.8.2/CYGWIN-PATCHES/fix-libtool-scripts-for-latest-gcc-runtimes.sh	2013-11-08 22:19:30.903592600 +0800
-@@ -0,0 +1,16 @@
-+libdir=${@:-/usr/lib}
-+
-+[ ! -d ${libdir} ] && exit 1
-+
-+extrafiles=$(ls -1 2>/dev/null /usr/bin/libtool \
-+      /usr/share/apr/build-1/libtool \
-+      /usr/lib/R/bin/libtool /usr/lib/rep/i686-pc-cygwin/libtool)
-+
-+echo "${extrafiles}" \
-+  | xargs -r grep -l '^sys_lib_search_path_spec=.*/usr/lib/gcc/i686-pc-cygwin/[34].[3-9].[0-9]' \
-+  | xargs -r sed -i -e "/^sys_lib_search_path_spec=/ s|\(pc-cygwin\)/[34].[3-9].[0-9]|\1/$(/usr/bin/gcc-4 -dumpversion)|g"
-+
-+find ${libdir} -type f -name '*.la' \
-+  | xargs -r grep -l '^dependency_libs=.*/usr/lib/gcc/i686-pc-cygwin/[34].[3-9].[0-9]/lib[a-z_+]*.la' \
-+  | xargs -r sed -i -e "/^dependency_libs=/ s|[^ ]*pc-cygwin/[34].[3-9].[0-9]/lib\([a-z_+]*\)\.la|-l\1|g"
-+