From 52412049809da45dccba9f6e8d98d61ec7c024a2 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Sat, 14 Jan 2006 12:32:50 +0000
Subject: * sysdeps/unix/sysv/linux/sparc/sparc32/nldbl-abi.h: New file.

	* sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h: #include <nldbl-abi.h>
	to define LONG_DOUBLE_COMPAT_VERSION.  Use that in place of
	NLDBL_VERSION.
	* sysdeps/ieee754/ldbl-opt/Versions: Include <nldbl-abi.h>.
	* sysdeps/unix/sysv/linux/sparc/sparc32/Versions: Revert last change.
---
 sysdeps/ieee754/ldbl-opt/Versions        | 3 ++-
 sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'sysdeps/ieee754')

diff --git a/sysdeps/ieee754/ldbl-opt/Versions b/sysdeps/ieee754/ldbl-opt/Versions
index 337db192d6..d22b18ec89 100644
--- a/sysdeps/ieee754/ldbl-opt/Versions
+++ b/sysdeps/ieee754/ldbl-opt/Versions
@@ -1,5 +1,6 @@
+%include <nldbl-abi.h>
 %ifndef NLDBL_VERSION
-% error "CPU-specific sysdeps/.../Version file must %define NLDBL_VERSION"
+% error "nldbl-abi.h must define NLDBL_VERSION"
 %endif
 
 libc {
diff --git a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
index c37ed861dc..d6f0214991 100644
--- a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
+++ b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
@@ -1,16 +1,17 @@
 /* -mlong-double-64 compatibility mode macros.  */
 
-#ifndef NLDBL_VERSION
-# define NLDBL_VERSION GLIBC_2_4
+#include <nldbl-abi.h>
+#ifndef LONG_DOUBLE_COMPAT_VERSION
+# 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, NLDBL_VERSION)
+  SHLIB_COMPAT(lib, introduced, LONG_DOUBLE_COMPAT_VERSION)
 #define long_double_symbol(lib, local, symbol) \
-  long_double_symbol_1 (lib, local, symbol, NLDBL_VERSION)
+  long_double_symbol_1 (lib, local, symbol, LONG_DOUBLE_COMPAT_VERSION)
 #if defined HAVE_ELF && defined SHARED && defined DO_VERSIONING
 # define ldbl_hidden_def(local, name) libc_hidden_ver (local, name)
 # define ldbl_strong_alias(name, aliasname) \
-- 
cgit 1.4.1