summaryrefslogtreecommitdiff
path: root/libgomp/libgomp.map
diff options
context:
space:
mode:
authorro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2010-07-05 17:19:33 +0000
committerro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2010-07-05 17:19:33 +0000
commit71cbce26c5ccce4738f8b1f3d403b5162e43a2d4 (patch)
tree70ed1ada8aa540dd60006d46db146cf2635262a4 /libgomp/libgomp.map
parent8eb9cb0e65308833014935b086f017f444777b5c (diff)
downloadgcc-71cbce26c5ccce4738f8b1f3d403b5162e43a2d4.tar.gz
* acinclude.m4 (LIBGOMP_ENABLE_SYMVERS): Handle sun style.
Define LIBGOMP_BUILD_VERSIONED_SHLIB_GNU, LIBGOMP_BUILD_VERSIONED_SHLIB_SUN automake conditionals. (HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT): Define unless targetting solaris2*. * configure: Regenerate. * config.h.in: Regenerate. * Makefile.am [LIBGOMP_BUILD_VERSIONED_SHLIB]: Protect libgomp_version_script with LIBGOMP_BUILD_VERSIONED_SHLIB_GNU. Add libgomp_version_dep. [LIBGOMP_BUILD_VERSIONED_SHLIB_SUN]: Handle Sun symbol versioning. [!LIBGOMP_BUILD_VERSIONED_SHLIB]: Add libgomp_version_dep. (libgomp_la_DEPENDENCIES): Set to $(libgomp_version_dep). * Makefile.in: Regenerate. * libgomp.h (LIBGOMP_GNU_SYMBOL_VERSIONING): Undef unless HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT. * libgomp.map (OMP_1.0): Move symbols both in OMP_1.0 and OMP_3.0 to common block, protected by HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@161842 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp/libgomp.map')
-rw-r--r--libgomp/libgomp.map21
1 files changed, 13 insertions, 8 deletions
diff --git a/libgomp/libgomp.map b/libgomp/libgomp.map
index e6c12fa0019..d95693dbdde 100644
--- a/libgomp/libgomp.map
+++ b/libgomp/libgomp.map
@@ -10,6 +10,10 @@ OMP_1.0 {
omp_get_dynamic;
omp_set_nested;
omp_get_nested;
+#ifdef HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT
+ # If the assembler used lacks the .symver directive or the linker
+ # doesn't support GNU symbol versioning, we have the same symbol in
+ # two versions, which Sun ld chokes on.
omp_init_lock;
omp_init_nest_lock;
omp_destroy_lock;
@@ -22,6 +26,15 @@ OMP_1.0 {
omp_test_nest_lock;
omp_destroy_lock_;
omp_destroy_nest_lock_;
+ omp_init_lock_;
+ omp_init_nest_lock_;
+ omp_set_lock_;
+ omp_set_nest_lock_;
+ omp_test_lock_;
+ omp_test_nest_lock_;
+ omp_unset_lock_;
+ omp_unset_nest_lock_;
+#endif
omp_get_dynamic_;
omp_get_max_threads_;
omp_get_nested_;
@@ -29,20 +42,12 @@ OMP_1.0 {
omp_get_num_threads_;
omp_get_thread_num_;
omp_in_parallel_;
- omp_init_lock_;
- omp_init_nest_lock_;
omp_set_dynamic_;
omp_set_dynamic_8_;
- omp_set_lock_;
- omp_set_nest_lock_;
omp_set_nested_;
omp_set_nested_8_;
omp_set_num_threads_;
omp_set_num_threads_8_;
- omp_test_lock_;
- omp_test_nest_lock_;
- omp_unset_lock_;
- omp_unset_nest_lock_;
local:
*;
};