Enable OpenMP
Change-Id: I77806236bc46626975be2eea5be7e77956dff757
diff --git a/build/tools/build-gcc.sh b/build/tools/build-gcc.sh
index d73d479..6b0843f 100755
--- a/build/tools/build-gcc.sh
+++ b/build/tools/build-gcc.sh
@@ -233,6 +233,9 @@
# the flags are ignored for older GCC versions.
EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --disable-libquadmath --disable-plugin"
+# Enable OpenMP
+EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --enable-libgomp"
+
# Enable Gold as default
case "$TOOLCHAIN" in
# Note that only ARM and X86 are supported
@@ -316,6 +319,16 @@
# copy to toolchain path
run copy_directory "$TOOLCHAIN_BUILD_PREFIX" "$TOOLCHAIN_PATH"
+if [ "$MINGW" = "yes" ] ; then
+ # For some reasons, libraries in $ABI_CONFIGURE_TARGET (*) are not installed.
+ # Hack here to copy them over.
+ # (*) FYI: libgcc.a and libgcov.a not installed there in the first place
+ INSTALL_TARGET_LIB_PATH="$BUILD_OUT/host-$ABI_CONFIGURE_BUILD/install/$ABI_CONFIGURE_TARGET/lib"
+ TOOLCHAIN_TARGET_LIB_PATH="$TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/lib"
+ (cd "$INSTALL_TARGET_LIB_PATH" &&
+ find . \( -name "*.a" -o -name "*.la" -o -name "*.spec" \) -exec install -D "{}" "$TOOLCHAIN_TARGET_LIB_PATH/{}" \;)
+fi
+
# don't forget to copy the GPL and LGPL license files
run cp -f $TOOLCHAIN_LICENSES/COPYING $TOOLCHAIN_LICENSES/COPYING.LIB $TOOLCHAIN_PATH
diff --git a/build/tools/gen-platforms.sh b/build/tools/gen-platforms.sh
index 3f9d14e..0ced51f 100755
--- a/build/tools/gen-platforms.sh
+++ b/build/tools/gen-platforms.sh
@@ -633,6 +633,9 @@
# Generate shared libraries from symbol files
gen_shared_libraries $ARCH $PLATFORM_SRC/arch-$ARCH/symbols $PLATFORM_DST/arch-$ARCH
+ else
+ # Copy the prebuilt binaries to bootstrap GCC
+ copy_src_directory $PLATFORM_SRC/arch-$ARCH/lib-bootstrap $SYSROOT_DST/lib "$ARCH sysroot libs (boostrap)"
fi
PREV_SYSROOT_DST=$SYSROOT_DST
done
