From 8887708edc83bd88890140789324c0880ecbe1ca Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Fri, 6 Oct 2006 08:25:32 +0000 Subject: [PATCH] acinclude.m4 (HAVE_ATTRIBUTE_ALIAS): Remove __USER_LABEL_PREFIX__ from test. * acinclude.m4 (HAVE_ATTRIBUTE_ALIAS): Remove __USER_LABEL_PREFIX__ from test. * configure: Regenerate. * fortran.c (ialias_redirect): Add __USER_LABEL_PREFIX__ to alias. From-SVN: r117490 --- libgomp/ChangeLog | 7 +++++++ libgomp/acinclude.m4 | 5 +---- libgomp/configure | 5 +---- libgomp/fortran.c | 5 ++++- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index a4c470cc703..d39005ca23f 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,10 @@ +2006-10-05 Danny Smith + + * acinclude.m4 (HAVE_ATTRIBUTE_ALIAS): Remove __USER_LABEL_PREFIX__ from + test. + * configure: Regenerate. + * fortran.c (ialias_redirect): Add __USER_LABEL_PREFIX__ to alias. + 2006-09-26 Jakub Jelinek PR middle-end/25261 diff --git a/libgomp/acinclude.m4 b/libgomp/acinclude.m4 index b7428cfe35d..e8de93db1b1 100644 --- a/libgomp/acinclude.m4 +++ b/libgomp/acinclude.m4 @@ -47,11 +47,8 @@ AC_DEFUN([LIBGOMP_CHECK_ATTRIBUTE_ALIAS], [ AC_CACHE_CHECK([whether the target supports symbol aliases], have_attribute_alias, [ AC_TRY_LINK([ -#define ULP STR1(__USER_LABEL_PREFIX__) -#define STR1(x) STR2(x) -#define STR2(x) #x void foo(void) { } -extern void bar(void) __attribute__((alias(ULP "foo")));], +extern void bar(void) __attribute__((alias("foo")));], [bar();], have_attribute_alias=yes, have_attribute_alias=no)]) if test $have_attribute_alias = yes; then AC_DEFINE(HAVE_ATTRIBUTE_ALIAS, 1, diff --git a/libgomp/configure b/libgomp/configure index f01acbfd96b..075df3ef6eb 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -9087,11 +9087,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#define ULP STR1(__USER_LABEL_PREFIX__) -#define STR1(x) STR2(x) -#define STR2(x) #x void foo(void) { } -extern void bar(void) __attribute__((alias(ULP "foo"))); +extern void bar(void) __attribute__((alias("foo"))); int main () { diff --git a/libgomp/fortran.c b/libgomp/fortran.c index a6f217ddbde..f6f64c61be2 100644 --- a/libgomp/fortran.c +++ b/libgomp/fortran.c @@ -33,8 +33,11 @@ #ifdef HAVE_ATTRIBUTE_ALIAS /* Use internal aliases if possible. */ +#define ULP STR1(__USER_LABEL_PREFIX__) +#define STR1(x) STR2(x) +#define STR2(x) #x # define ialias_redirect(fn) \ - extern __typeof (fn) fn __asm__ ("gomp_ialias_" #fn) attribute_hidden; + extern __typeof (fn) fn __asm__ (ULP "gomp_ialias_" #fn) attribute_hidden; ialias_redirect (omp_init_lock) ialias_redirect (omp_init_nest_lock) ialias_redirect (omp_destroy_lock)