From: Roland McGrath <roland@gnu.org>
Date: Thu, 19 Jan 2006 07:29:08 +0000 (+0000)
Subject: 2006-01-18  Roland McGrath  <roland@redhat.com>
X-Git-Tag: cvs/fedora-glibc-20060130T0922~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04a8a3c10ad6aa8c2331794dbc572c3c8575b09c;p=thirdparty%2Fglibc.git

2006-01-18  Roland McGrath  <roland@redhat.com>

	* sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h [__ASSEMBLER__]: Don't
	include problematic headers for assembler.
---

diff --git a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
index d6f0214991e..bba00c1565f 100644
--- a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
+++ b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
@@ -5,8 +5,6 @@
 # error "nldbl-abi.h must define LONG_DOUBLE_COMPAT_VERSION"
 #endif
 
-#include <math.h>
-#include <math/math_private.h>
 #include <shlib-compat.h>
 #define LONG_DOUBLE_COMPAT(lib, introduced) \
   SHLIB_COMPAT(lib, introduced, LONG_DOUBLE_COMPAT_VERSION)
@@ -29,7 +27,7 @@
 /* Note that weak_alias cannot be used - it is defined to nothing
    in most of the files.  */
 # define long_double_symbol_1(lib, local, symbol, version) \
-  _weak_alias (local, symbol)
+  weak_alias (local, symbol)
 #else
 # define ldbl_hidden_def(local, name) libc_hidden_def (name)
 # define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname)
@@ -38,7 +36,12 @@
   strong_alias (local, symbol)
 #endif
 
+#ifndef __ASSEMBLER__
+# include <math.h>
+# include <math/math_private.h>
+
 /* Set temporarily to non-zero if long double should be considered
    the same as double.  */
 extern __thread int __no_long_double attribute_tls_model_ie attribute_hidden;
-#define __ldbl_is_dbl __builtin_expect (__no_long_double, 0)
+# define __ldbl_is_dbl __builtin_expect (__no_long_double, 0)
+#endif