about summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-02-11 10:17:19 +0000
committerRoland McGrath <roland@gnu.org>2005-02-11 10:17:19 +0000
commit3e1e123d02fa495961898f390741bd743a92022d (patch)
treeed5b2fddac71558294faac14742a16f723643746 /include
parent9b382805e29a41abca88de8cd0348958d90f724f (diff)
downloadglibc-3e1e123d02fa495961898f390741bd743a92022d.tar.gz
glibc-3e1e123d02fa495961898f390741bd743a92022d.tar.xz
glibc-3e1e123d02fa495961898f390741bd743a92022d.zip
	* Makefile (installed-stubs): New variable.
	Set to $(inst_includedir)/gnu/stubs.h if $(biarch) is no,
	or to $(inst_includedir)/gnu/stubs-$(biarch).h if otherwise.
	[$(biarch) != no] (install-others-nosubdir): Add $(installed-stubs).
	($(inst_includedir)/gnu/stubs.h): Use $(installed-stubs) for this
	rule's target.
	($(inst_includedir)/gnu/stubs.h): New target, install from ...
	* include/stubs-biarch.h: New file.

	* shlib-versions (i.86-.*-.*): Add WORDSIZE64 line mapping to x86_64.

	* Makeconfig ($(common-objpfx)soversions.mk): Depend on Makeconfig.
	Emit defn for variable `biarch'.

	* include/stub-tag.h: Update comment.
Diffstat (limited to 'include')
-rw-r--r--include/stub-tag.h7
-rw-r--r--include/stubs-biarch.h12
2 files changed, 15 insertions, 4 deletions
diff --git a/include/stub-tag.h b/include/stub-tag.h
index 3004d6f429..d4d10c8341 100644
--- a/include/stub-tag.h
+++ b/include/stub-tag.h
@@ -1,5 +1,4 @@
 /* This header is included into every file that declares a stub function.
- * The build process looks for this header in .d files to decide whether
- * or not it needs to scan the corresponding .c file for entries to add to
- * <gnu/stubs.h>.
- */
+   It is obsolete now, but hasn't died to avoid removing all those
+   #include's.  Every such file should use the `stub_warning' macro for
+   each of its functions, and that is sufficient.  */
diff --git a/include/stubs-biarch.h b/include/stubs-biarch.h
new file mode 100644
index 0000000000..fc086bd894
--- /dev/null
+++ b/include/stubs-biarch.h
@@ -0,0 +1,12 @@
+/* This file selects the right generated file of `__stub_FUNCTION' macros
+   based on the architecture being compiled for.  */
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include <gnu/stubs-32.h>
+#elif __WORDSIZE == 64
+# include <gnu/stubs-64.h>
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif