Enable libgomp (#97)

* Enable libgomp

* Add pthread to LIB_SPEC

* add pthread as driver option

* enable libgomp build

* buildscripts: fix libgomp for windows

Author: frangarcj

CMakeLists.txt

@@ -434,7 +434,6 @@ set(common_gcc_configure_args
     --enable-languages=c,c++
     --disable-decimal-float
     --disable-libffi
-    --disable-libgomp
     --disable-libmudflap
     --disable-libquadmath
     --disable-libssp
@@ -482,6 +481,7 @@ ExternalProject_add(gcc-base
     ${common_gcc_configure_args}
     --disable-threads
     --without-headers
+    --disable-libgomp
     "CFLAGS=${GCC_CFLAGS}"
     "CXXFLAGS=${GCC_CFLAGS}"
     BUILD_COMMAND $(MAKE) all-gcc
@@ -505,6 +505,9 @@ ExternalProject_add(vita-headers
     # Copy the include headers to the installation directory
     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_INSTALL_PREFIX}/${target_arch}/include
     COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${CMAKE_INSTALL_PREFIX}/${target_arch}/include
+    # Copy the generated .a files to the toolchain directory (required for libgomp target)
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${toolchain_build_install_dir}/${target_arch}/lib
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_INSTALL_PREFIX}/${target_arch}/lib ${toolchain_build_install_dir}/${target_arch}/lib
     # Install a copy of the headers in the toolchain directory (required for pthread-embedded target)
     COMMAND ${CMAKE_COMMAND} -E make_directory ${toolchain_build_install_dir}/${target_arch}/include
     COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/include ${toolchain_build_install_dir}/${target_arch}/include
@@ -570,6 +573,7 @@ if(CMAKE_TOOLCHAIN_FILE)
         ${common_gcc_configure_args}
         --disable-threads
         --with-headers=yes
+        --disable-libgomp
         "CFLAGS=${GCC_CFLAGS}"
         "CXXFLAGS=${GCC_CFLAGS}"
         BUILD_COMMAND ${toolchain_tools} ${wrapper_command} $(MAKE) INHIBIT_LIBC_CFLAGS="-DUSE_TM_CLONE_REGISTRY=0"
@@ -593,6 +597,8 @@ ExternalProject_Add(pthread-embedded
     BUILD_COMMAND ${compiler_flags} ${wrapper_command} $(MAKE)
     -C <SOURCE_DIR>/platform/vita ${pthread_tools} PREFIX=${CMAKE_INSTALL_PREFIX}
     INSTALL_COMMAND $(MAKE) -C <SOURCE_DIR>/platform/vita PREFIX=${CMAKE_INSTALL_PREFIX}/${target_arch} install
+    # Install into the toolchain directory (required for libgomp target)
+    COMMAND $(MAKE) install -C <SOURCE_DIR>/platform/vita PREFIX=${toolchain_build_install_dir}/${target_arch} install
     # Save the commit id for tracking purposes
     COMMAND ${GIT_EXECUTABLE} -C <SOURCE_DIR> rev-parse HEAD > ${CMAKE_BINARY_DIR}/pthread-embedded-version.txt
     ${UPDATE_DISCONNECTED_SUPPORT}
@@ -622,6 +628,7 @@ ExternalProject_add(gcc-final
     ${common_gcc_configure_args}
     --with-headers=yes
     --enable-threads=posix
+    --enable-libgomp
     "CFLAGS=${GCC_CFLAGS}"
     "CXXFLAGS=${GCC_CFLAGS}"
     BUILD_COMMAND ${toolchain_tools} ${compiler_target_tools} ${wrapper_command}

patches/gcc/0001-gcc-8.patch

@@ -37,7 +37,55 @@ index 4f57765b0..a4d5ffb14 100644
 +#undef LIB_SPEC
  #ifndef LIB_SPEC
 -#define LIB_SPEC "%{!shared:%{g*:-lg} %{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}}"
-+#define LIB_SPEC "%{!shared:%{g*:-lg} %{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}} -lSceRtc_stub -lSceSysmem_stub -lSceKernelThreadMgr_stub -lSceKernelModulemgr_stub -lSceIofilemgr_stub -lSceProcessmgr_stub -lSceLibKernel_stub -lSceNet_stub"
++#define LIB_SPEC "%{!shared:%{g*:-lg} %{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}} %{pthread:--whole-archive -lpthread --no-whole-archive} -lSceRtc_stub -lSceSysmem_stub -lSceKernelThreadMgr_stub -lSceKernelModulemgr_stub -lSceIofilemgr_stub -lSceProcessmgr_stub -lSceLibKernel_stub -lSceNet_stub"
  #endif
 
  /* When using -fsplit-stack we need to wrap pthread_create, in order
+diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
+index af478a946b2..31d0ff7fd18 100644
+--- a/gcc/config/arm/arm.opt
++++ b/gcc/config/arm/arm.opt
+@@ -21,6 +21,9 @@
+ HeaderInclude
+ config/arm/arm-opts.h
+ 
++pthread
++Driver
++
+ Enum
+ Name(tls_type) Type(enum arm_tls_type)
+ TLS dialect to use:
+diff --git a/libgomp/configure b/libgomp/configure
+index 6161da579c0..68c31eaad2b 100755
+--- a/libgomp/configure
++++ b/libgomp/configure
+@@ -15720,29 +15720,6 @@ $as_echo "#define HAVE_UNAME 1" >>confdefs.h
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-# Check for gethostname.
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <unistd.h>
+-int
+-main ()
+-{
+-
+-   char buf[256];
+-   if (gethostname (buf, sizeof (buf) - 1) == 0)
+-     buf[255] = '\0';
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+ # Check for getpid.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */