summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libl4/ChangeLog2
-rw-r--r--libl4/headers.m4136
-rw-r--r--platform/ChangeLog4
-rw-r--r--platform/headers.m414
4 files changed, 81 insertions, 75 deletions
diff --git a/libl4/ChangeLog b/libl4/ChangeLog
index 272e639..86deaeb 100644
--- a/libl4/ChangeLog
+++ b/libl4/ChangeLog
@@ -1,5 +1,7 @@
2008-05-29 Thomas Schwinge <tschwinge@gnu.org>
+ * headers.m4: Link files into `sysroot/include/' instead of `include/'.
+
* tests/Makefile.am (noinst_PROGRAMS): Rename to...
(check_PROGRAMS): ... this.
(AM_CPPFLAGS): Set to $(CHECK_CPPFLAGS).
diff --git a/libl4/headers.m4 b/libl4/headers.m4
index 1de9014..48cf249 100644
--- a/libl4/headers.m4
+++ b/libl4/headers.m4
@@ -11,79 +11,79 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
AC_CONFIG_LINKS([
- include/l4.h:libl4/l4.h
- include/l4/features.h:libl4/l4/features.h
- include/l4/abi.h:libl4/l4/abi.h
- include/l4/globals.h:libl4/l4/globals.h
- include/l4/init.h:libl4/l4/init.h
- include/l4/ipc.h:libl4/l4/ipc.h
- include/l4/kip.h:libl4/l4/kip.h
- include/l4/math.h:libl4/l4/math.h
- include/l4/message.h:libl4/l4/message.h
- include/l4/misc.h:libl4/l4/misc.h
- include/l4/arch.h:libl4/l4/arch.h
- include/l4/pagefault.h:libl4/l4/pagefault.h
- include/l4/schedule.h:libl4/l4/schedule.h
- include/l4/space.h:libl4/l4/space.h
- include/l4/stubs-init.h:libl4/l4/stubs-init.h
- include/l4/stubs.h:libl4/l4/stubs.h
- include/l4/syscall.h:libl4/l4/syscall.h
- include/l4/thread.h:libl4/l4/thread.h
- include/l4/thread-start.h:libl4/l4/thread-start.h
- include/l4/types.h:libl4/l4/types.h
- include/l4/vregs.h:libl4/l4/vregs.h
- include/l4/sigma0.h:libl4/l4/sigma0.h
- include/l4/compat/ipc.h:libl4/l4/compat/ipc.h
- include/l4/compat/kip.h:libl4/l4/compat/kip.h
- include/l4/compat/message.h:libl4/l4/compat/message.h
- include/l4/compat/misc.h:libl4/l4/compat/misc.h
- include/l4/compat/schedule.h:libl4/l4/compat/schedule.h
- include/l4/compat/space.h:libl4/l4/compat/space.h
- include/l4/compat/syscall.h:libl4/l4/compat/syscall.h
- include/l4/compat/thread.h:libl4/l4/compat/thread.h
- include/l4/compat/types.h:libl4/l4/compat/types.h
- include/l4/compat/sigma0.h:libl4/l4/compat/sigma0.h
- include/l4/gnu/ipc.h:libl4/l4/gnu/ipc.h
- include/l4/gnu/kip.h:libl4/l4/gnu/kip.h
- include/l4/gnu/math.h:libl4/l4/gnu/math.h
- include/l4/gnu/message.h:libl4/l4/gnu/message.h
- include/l4/gnu/misc.h:libl4/l4/gnu/misc.h
- include/l4/gnu/pagefault.h:libl4/l4/gnu/pagefault.h
- include/l4/gnu/schedule.h:libl4/l4/gnu/schedule.h
- include/l4/gnu/space.h:libl4/l4/gnu/space.h
- include/l4/gnu/syscall.h:libl4/l4/gnu/syscall.h
- include/l4/gnu/thread.h:libl4/l4/gnu/thread.h
- include/l4/gnu/thread-start.h:libl4/l4/gnu/thread-start.h
- include/l4/gnu/types.h:libl4/l4/gnu/types.h
- include/l4/gnu/sigma0.h:libl4/l4/gnu/sigma0.h
- include/l4/bits/ipc.h:libl4/${arch}/l4/bits/ipc.h
- include/l4/bits/kip.h:libl4/${arch}/l4/bits/kip.h
- include/l4/bits/math.h:libl4/${arch}/l4/bits/math.h
- include/l4/bits/misc.h:libl4/${arch}/l4/bits/misc.h
- include/l4/bits/arch.h:libl4/${arch}/l4/bits/arch.h
- include/l4/bits/space.h:libl4/${arch}/l4/bits/space.h
- include/l4/bits/stubs.h:libl4/${arch}/l4/bits/stubs.h
- include/l4/bits/stubs-init.h:libl4/${arch}/l4/bits/stubs-init.h
- include/l4/bits/syscall.h:libl4/${arch}/l4/bits/syscall.h
- include/l4/bits/types.h:libl4/${arch}/l4/bits/types.h
- include/l4/bits/vregs.h:libl4/${arch}/l4/bits/vregs.h
- include/l4/bits/compat/ipc.h:libl4/${arch}/l4/bits/compat/ipc.h
- include/l4/bits/compat/misc.h:libl4/${arch}/l4/bits/compat/misc.h
- include/l4/bits/compat/arch.h:libl4/${arch}/l4/bits/compat/arch.h
- include/l4/bits/compat/space.h:libl4/${arch}/l4/bits/compat/space.h
- include/l4/bits/gnu/ipc.h:libl4/${arch}/l4/bits/gnu/ipc.h
- include/l4/bits/gnu/kip.h:libl4/${arch}/l4/bits/gnu/kip.h
- include/l4/bits/gnu/misc.h:libl4/${arch}/l4/bits/gnu/misc.h
- include/l4/bits/gnu/arch.h:libl4/${arch}/l4/bits/gnu/arch.h
- include/l4/bits/gnu/space.h:libl4/${arch}/l4/bits/gnu/space.h
- include/l4/abi/kip.h:libl4/${l4_abi}/l4/abi/kip.h
- include/l4/abi/abi.h:libl4/${l4_abi}/l4/abi/abi.h
+ sysroot/include/l4.h:libl4/l4.h
+ sysroot/include/l4/features.h:libl4/l4/features.h
+ sysroot/include/l4/abi.h:libl4/l4/abi.h
+ sysroot/include/l4/globals.h:libl4/l4/globals.h
+ sysroot/include/l4/init.h:libl4/l4/init.h
+ sysroot/include/l4/ipc.h:libl4/l4/ipc.h
+ sysroot/include/l4/kip.h:libl4/l4/kip.h
+ sysroot/include/l4/math.h:libl4/l4/math.h
+ sysroot/include/l4/message.h:libl4/l4/message.h
+ sysroot/include/l4/misc.h:libl4/l4/misc.h
+ sysroot/include/l4/arch.h:libl4/l4/arch.h
+ sysroot/include/l4/pagefault.h:libl4/l4/pagefault.h
+ sysroot/include/l4/schedule.h:libl4/l4/schedule.h
+ sysroot/include/l4/space.h:libl4/l4/space.h
+ sysroot/include/l4/stubs-init.h:libl4/l4/stubs-init.h
+ sysroot/include/l4/stubs.h:libl4/l4/stubs.h
+ sysroot/include/l4/syscall.h:libl4/l4/syscall.h
+ sysroot/include/l4/thread.h:libl4/l4/thread.h
+ sysroot/include/l4/thread-start.h:libl4/l4/thread-start.h
+ sysroot/include/l4/types.h:libl4/l4/types.h
+ sysroot/include/l4/vregs.h:libl4/l4/vregs.h
+ sysroot/include/l4/sigma0.h:libl4/l4/sigma0.h
+ sysroot/include/l4/compat/ipc.h:libl4/l4/compat/ipc.h
+ sysroot/include/l4/compat/kip.h:libl4/l4/compat/kip.h
+ sysroot/include/l4/compat/message.h:libl4/l4/compat/message.h
+ sysroot/include/l4/compat/misc.h:libl4/l4/compat/misc.h
+ sysroot/include/l4/compat/schedule.h:libl4/l4/compat/schedule.h
+ sysroot/include/l4/compat/space.h:libl4/l4/compat/space.h
+ sysroot/include/l4/compat/syscall.h:libl4/l4/compat/syscall.h
+ sysroot/include/l4/compat/thread.h:libl4/l4/compat/thread.h
+ sysroot/include/l4/compat/types.h:libl4/l4/compat/types.h
+ sysroot/include/l4/compat/sigma0.h:libl4/l4/compat/sigma0.h
+ sysroot/include/l4/gnu/ipc.h:libl4/l4/gnu/ipc.h
+ sysroot/include/l4/gnu/kip.h:libl4/l4/gnu/kip.h
+ sysroot/include/l4/gnu/math.h:libl4/l4/gnu/math.h
+ sysroot/include/l4/gnu/message.h:libl4/l4/gnu/message.h
+ sysroot/include/l4/gnu/misc.h:libl4/l4/gnu/misc.h
+ sysroot/include/l4/gnu/pagefault.h:libl4/l4/gnu/pagefault.h
+ sysroot/include/l4/gnu/schedule.h:libl4/l4/gnu/schedule.h
+ sysroot/include/l4/gnu/space.h:libl4/l4/gnu/space.h
+ sysroot/include/l4/gnu/syscall.h:libl4/l4/gnu/syscall.h
+ sysroot/include/l4/gnu/thread.h:libl4/l4/gnu/thread.h
+ sysroot/include/l4/gnu/thread-start.h:libl4/l4/gnu/thread-start.h
+ sysroot/include/l4/gnu/types.h:libl4/l4/gnu/types.h
+ sysroot/include/l4/gnu/sigma0.h:libl4/l4/gnu/sigma0.h
+ sysroot/include/l4/bits/ipc.h:libl4/${arch}/l4/bits/ipc.h
+ sysroot/include/l4/bits/kip.h:libl4/${arch}/l4/bits/kip.h
+ sysroot/include/l4/bits/math.h:libl4/${arch}/l4/bits/math.h
+ sysroot/include/l4/bits/misc.h:libl4/${arch}/l4/bits/misc.h
+ sysroot/include/l4/bits/arch.h:libl4/${arch}/l4/bits/arch.h
+ sysroot/include/l4/bits/space.h:libl4/${arch}/l4/bits/space.h
+ sysroot/include/l4/bits/stubs.h:libl4/${arch}/l4/bits/stubs.h
+ sysroot/include/l4/bits/stubs-init.h:libl4/${arch}/l4/bits/stubs-init.h
+ sysroot/include/l4/bits/syscall.h:libl4/${arch}/l4/bits/syscall.h
+ sysroot/include/l4/bits/types.h:libl4/${arch}/l4/bits/types.h
+ sysroot/include/l4/bits/vregs.h:libl4/${arch}/l4/bits/vregs.h
+ sysroot/include/l4/bits/compat/ipc.h:libl4/${arch}/l4/bits/compat/ipc.h
+ sysroot/include/l4/bits/compat/misc.h:libl4/${arch}/l4/bits/compat/misc.h
+ sysroot/include/l4/bits/compat/arch.h:libl4/${arch}/l4/bits/compat/arch.h
+ sysroot/include/l4/bits/compat/space.h:libl4/${arch}/l4/bits/compat/space.h
+ sysroot/include/l4/bits/gnu/ipc.h:libl4/${arch}/l4/bits/gnu/ipc.h
+ sysroot/include/l4/bits/gnu/kip.h:libl4/${arch}/l4/bits/gnu/kip.h
+ sysroot/include/l4/bits/gnu/misc.h:libl4/${arch}/l4/bits/gnu/misc.h
+ sysroot/include/l4/bits/gnu/arch.h:libl4/${arch}/l4/bits/gnu/arch.h
+ sysroot/include/l4/bits/gnu/space.h:libl4/${arch}/l4/bits/gnu/space.h
+ sysroot/include/l4/abi/kip.h:libl4/${l4_abi}/l4/abi/kip.h
+ sysroot/include/l4/abi/abi.h:libl4/${l4_abi}/l4/abi/abi.h
])
if test x$l4_abi = xv2
then
AC_CONFIG_LINKS([
- include/l4/abi/bits/kip.h:libl4/v2/${arch}/l4/abi/bits/kip.h
+ sysroot/include/l4/abi/bits/kip.h:libl4/v2/${arch}/l4/abi/bits/kip.h
])
fi
diff --git a/platform/ChangeLog b/platform/ChangeLog
index 7adb042..8b46776 100644
--- a/platform/ChangeLog
+++ b/platform/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-29 Thomas Schwinge <tschwinge@gnu.org>
+
+ * headers.m4: Link files into `sysroot/include/' instead of `include/'.
+
2008-02-20 Thomas Schwinge <tschwinge@gnu.org>
* amd64/sys/io.h: New file, from today's glibc CVS HEAD.
diff --git a/platform/headers.m4 b/platform/headers.m4
index f9bfd50..808d839 100644
--- a/platform/headers.m4
+++ b/platform/headers.m4
@@ -13,11 +13,11 @@
# glibc allows for more complicated sysdep constructs, which are used, e.g.,
# for the <bits/wordsize.h> case. We'll go for a simple solution for now.
AC_CONFIG_LINKS([
- include/atomic.h:platform/atomic.h
- include/bits/atomic.h:platform/${arch}/bits/atomic.h
- include/bits/wordsize.h:platform/${arch}/bits/wordsize.h
- include/compiler.h:platform/compiler.h
- include/endian.h:platform/endian.h
- include/bits/endian.h:platform/${arch}/bits/endian.h
- include/sys/io.h:platform/${arch}/sys/io.h
+ sysroot/include/atomic.h:platform/atomic.h
+ sysroot/include/bits/atomic.h:platform/${arch}/bits/atomic.h
+ sysroot/include/bits/wordsize.h:platform/${arch}/bits/wordsize.h
+ sysroot/include/compiler.h:platform/compiler.h
+ sysroot/include/endian.h:platform/endian.h
+ sysroot/include/bits/endian.h:platform/${arch}/bits/endian.h
+ sysroot/include/sys/io.h:platform/${arch}/sys/io.h
])