This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

PATCH: Move include/stubs-biarch.h to sysdeps/generic


Hi,

This patch moves include/stubs-biarch.h to sysdeps/generic so that
each arch can override it with sysdeps/cpu/stubs-biarch.h.  OK to
install?

Thanks.

H.J.
---
2012-03-16  H.J. Lu  <hongjiu.lu@intel.com>

	* Makefile ($(inst_includedir)/gnu/stubs.h): Replace
	include/stubs-biarch.h with stubs-biarch.h.

	* include/stubs-biarch.h: Moved to ...
	* sysdeps/generic/stubs-biarch.h: Here.

diff --git a/Makefile b/Makefile
index 5a31adb..807c539 100644
--- a/Makefile
+++ b/Makefile
@@ -176,7 +176,7 @@ installed-stubs = $(inst_includedir)/gnu/stubs.h
 else
 installed-stubs = $(inst_includedir)/gnu/stubs-$(biarch).h
 
-$(inst_includedir)/gnu/stubs.h: include/stubs-biarch.h $(+force)
+$(inst_includedir)/gnu/stubs.h: stubs-biarch.h $(+force)
 	$(make-target-directory)
 	$(INSTALL_DATA) $< $@
 
diff --git a/include/stubs-biarch.h b/include/stubs-biarch.h
deleted file mode 100644
index fc086bd..0000000
--- a/include/stubs-biarch.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* 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
diff --git a/sysdeps/generic/stubs-biarch.h b/sysdeps/generic/stubs-biarch.h
new file mode 100644
index 0000000..fc086bd
--- /dev/null
+++ b/sysdeps/generic/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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]