--- a/src/gcc.mk	Fri Sep 11 04:00:35 2009 +0200
+++ b/src/gcc.mk	Sat Sep 19 04:46:12 2009 +0200
@@ -27,7 +27,7 @@
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION)-srcbase-2.zip
 $(PKG)_WEBSITE  := http://www.tdragon.net/recentgcc/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/tdm-gcc/Sources/TDM Sources/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := pkg_config mingwrt w32api binutils gcc-gmp gcc-mpfr gcc-core gcc-g++ gcc-objc gcc-fortran
+$(PKG)_DEPS     := pkg_config mingwrt w32api binutils gcc-gmp gcc-mpfr gcc-core gcc-g++ gcc-objc gcc-fortran gcc-pthreads
 
 define $(PKG)_UPDATE
     $(call SOURCEFORGE_FILES,http://sourceforge.net/projects/tdm-gcc/files/Sources/) | \
@@ -35,6 +35,20 @@
     tail -1
 endef
 
+$(PKG)_CONFIGURE_OPTIONS := \
+        --target='$(TARGET)' \
+        --prefix='$(PREFIX)' \
+        --enable-languages='c,c++,objc,fortran' \
+        --enable-version-specific-runtime-libs \
+        --with-gcc \
+        --with-gnu-ld \
+        --with-gnu-as \
+        --disable-nls \
+        --disable-shared \
+        --without-x \
+        --disable-win32-registry \
+        --enable-sjlj-exceptions
+
 define $(PKG)_BUILD
     # unpack GCC
     cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-core)
@@ -51,22 +65,30 @@
     mv '$(1)/$(gcc-gmp_SUBDIR)' '$(1)/$(gcc-core_SUBDIR)/gmp'
     cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-mpfr)
     mv '$(1)/$(gcc-mpfr_SUBDIR)' '$(1)/$(gcc-core_SUBDIR)/mpfr'
-    # build
+    # build everything of GCC except libgomp and libmudflap
     mkdir '$(1)/build'
     cd '$(1)/build' && '$(1)/$(gcc-core_SUBDIR)/configure' \
-        --target='$(TARGET)' \
-        --prefix='$(PREFIX)' \
-        --enable-languages='c,c++,objc,fortran' \
-        --enable-version-specific-runtime-libs \
-        --with-gcc \
-        --with-gnu-ld \
-        --with-gnu-as \
-        --disable-nls \
-        --disable-shared \
-        --without-x \
+        $(gcc_CONFIGURE_OPTIONS) \
         --enable-threads=win32 \
-        --disable-win32-registry \
-        --enable-sjlj-exceptions
+        --disable-libgomp \
+        --disable-libmudflap
     $(MAKE) -C '$(1)/build' -j '$(JOBS)'
     $(MAKE) -C '$(1)/build' -j 1 install
+    # unpack and build pthreads (needed by libgomp)
+    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-pthreads)
+    $(SED) '35i\#define PTW32_STATIC_LIB' -i '$(1)/$(gcc-pthreads_SUBDIR)/pthread.h'
+    $(MAKE) -C '$(1)/$(gcc-pthreads_SUBDIR)' -j 1 GC-static CROSS='$(TARGET)-'
+    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
+    $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/libpthreadGC2.a' '$(PREFIX)/$(TARGET)/lib/libpthread.a'
+    $(INSTALL) -d '$(PREFIX)/$(TARGET)/include'
+    $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/pthread.h'   '$(PREFIX)/$(TARGET)/include/'
+    $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/sched.h'     '$(PREFIX)/$(TARGET)/include/'
+    $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/semaphore.h' '$(PREFIX)/$(TARGET)/include/'
+    # build libgomp
+    mkdir '$(1)/build/$(TARGET)/libgomp'
+    cd '$(1)/build/$(TARGET)/libgomp' && '$(1)/$(gcc-core_SUBDIR)/libgomp/configure' \
+        $(gcc_CONFIGURE_OPTIONS) \
+        --host='$(TARGET)' \
+        LIBS='-lws2_32'
+    $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '$(JOBS)' install
 endef