diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index beecba9f667..11e0086516a 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,5 +1,9 @@ 2015-01-08 Thomas Schwinge + * configure.ac [tgt_dir] (offload_additional_lib_paths): Also add + "$tgt_dir/lib32". + * configure: Regenerate. + * testsuite/lib/libgomp.exp (libgomp_init): Correctly match "intelmic" in $offload_targets. diff --git a/libgomp/configure b/libgomp/configure index f5d6b6b57ba..d109fc1677a 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -16262,7 +16262,7 @@ if test x"$enable_offload_targets" != x; then fi if test x"$tgt_dir" != x; then offload_additional_options="$offload_additional_options -B$tgt_dir/libexec/gcc/\$(target_alias)/\$(gcc_version) -B$tgt_dir/bin" - offload_additional_lib_paths="$offload_additional_lib_paths:$tgt_dir/lib64:$tgt_dir/lib" + offload_additional_lib_paths="$offload_additional_lib_paths:$tgt_dir/lib64:$tgt_dir/lib:$tgt_dir/lib32" else offload_additional_options="$offload_additional_options -B\$(libexecdir)/gcc/\$(target_alias)/\$(gcc_version) -B\$(bindir)" offload_additional_lib_paths="$offload_additional_lib_paths:$toolexeclibdir" diff --git a/libgomp/configure.ac b/libgomp/configure.ac index 16ec158a79e..c8a98f0396e 100644 --- a/libgomp/configure.ac +++ b/libgomp/configure.ac @@ -304,7 +304,7 @@ if test x"$enable_offload_targets" != x; then fi if test x"$tgt_dir" != x; then offload_additional_options="$offload_additional_options -B$tgt_dir/libexec/gcc/\$(target_alias)/\$(gcc_version) -B$tgt_dir/bin" - offload_additional_lib_paths="$offload_additional_lib_paths:$tgt_dir/lib64:$tgt_dir/lib" + offload_additional_lib_paths="$offload_additional_lib_paths:$tgt_dir/lib64:$tgt_dir/lib:$tgt_dir/lib32" else offload_additional_options="$offload_additional_options -B\$(libexecdir)/gcc/\$(target_alias)/\$(gcc_version) -B\$(bindir)" offload_additional_lib_paths="$offload_additional_lib_paths:$toolexeclibdir"