diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | binutils/ChangeLog | 13 | ||||
| -rw-r--r-- | binutils/Makefrag.am | 24 | ||||
| -rw-r--r-- | binutils/patches/00-bfd-config-bfd.patch | 20 | ||||
| -rw-r--r-- | binutils/patches/01-ld-configure-tgt.patch | 19 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/Makefrag.am | 10 | ||||
| -rw-r--r-- | gcc/configury2.patch | 25 | ||||
| -rw-r--r-- | libl4/ChangeLog | 4 | ||||
| -rw-r--r-- | libl4/headers.m4 | 162 | ||||
| -rw-r--r-- | libpthread/ChangeLog | 12 | ||||
| -rw-r--r-- | libpthread/headers.m4 | 6 | ||||
| -rw-r--r-- | platform/ChangeLog | 14 | ||||
| -rw-r--r-- | platform/Makefile.am | 4 | ||||
| -rw-r--r-- | platform/x86_64/Makefile.am (renamed from platform/amd64/Makefile.am) | 0 | ||||
| -rw-r--r-- | platform/x86_64/bits/atomic.h (renamed from platform/amd64/bits/atomic.h) | 0 | ||||
| -rw-r--r-- | platform/x86_64/bits/endian.h (renamed from platform/amd64/bits/endian.h) | 0 | ||||
| -rw-r--r-- | platform/x86_64/bits/wordsize.h (renamed from platform/amd64/bits/wordsize.h) | 0 | ||||
| -rw-r--r-- | platform/x86_64/sys/io.h (renamed from platform/amd64/sys/io.h) | 0 |
20 files changed, 242 insertions, 93 deletions
@@ -1,3 +1,7 @@ +2008-11-19 Neal H. Walfield <neal@gnu.org> + + * configure.ac: Rename amd64 to x86_64. Update users. + 2008-12-17 Neal H. Walfield <neal@gnu.org> * libviengoos: New directory. diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 58d6449..f967169 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,16 @@ +2008-11-19 Neal H. Walfield <neal@gnu.org> + + * patches/00-bfd-config-bfd.patch: New file. + * patches/01-ld-configure-tgt.patch: New file. + * Makefrag.am (patch_files): New variable. + (EXTRA_DIST): Likewise. + ($(addsuffix .applied,$(patch_files))): Depend on + binutils/binutils/unpack.stamp and $(patch_files). Apply patches + to the source tree. + (rpatch): New rule. + (binutils/binutils/patch.stamp): Also depend on the applied patch + files. + 2008-11-03 Neal H. Walfield <neal@gnu.org> * Makefrag.am (binutils_version): Bump to 2.19. diff --git a/binutils/Makefrag.am b/binutils/Makefrag.am index 5350bbb..3fd3a0d 100644 --- a/binutils/Makefrag.am +++ b/binutils/Makefrag.am @@ -15,6 +15,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +# Patches to apply to the source tree. +patch_files = 00-bfd-config-bfd.patch \ + 01-ld-configure-tgt.patch + +EXTRA_DIST = $(addprefix binutils/patches/, $(patch_files)) + # The GNU binutils version that we use. binutils_version = 2.19 binutils_tarball = binutils-$(binutils_version).tar.bz2 @@ -33,7 +39,23 @@ $(srcdir)/binutils/binutils/unpack.stamp: $(srcdir)/binutils/$(binutils_tarball) && mv binutils-$(binutils_version) binutils ) touch $@ -$(srcdir)/binutils/binutils/patch.stamp: $(srcdir)/binutils/binutils/unpack.stamp +# Apply any local patches. (Revert any applied older version.) +$(addprefix $(srcdir)/binutils/binutils/,$(addsuffix .applied,$(patch_files))): $(srcdir)/binutils/binutils/unpack.stamp +$(addprefix $(srcdir)/binutils/binutils/,$(addsuffix .applied,$(patch_files))): $(srcdir)/binutils/binutils/%.applied: $(srcdir)/binutils/patches/% + if test -e "$@"; \ + then \ + ( cd $(srcdir)/binutils/binutils && sh /dev/stdin -R ) < $@ && rm -f $@; \ + fi + ( cd $(srcdir)/binutils/binutils && sh /dev/stdin ) < $< + cp $< $@ + +rpatch: + for p in $(shell tac -s ' ' $(patch_files)) ; do \ + (cd $(srcdir)/binutils/binutils; sh ../$(srcdir)/$${p} -R) || exit 1 ; \ + done + +$(srcdir)/binutils/binutils/patch.stamp: $(srcdir)/binutils/binutils/unpack.stamp \ + $(addprefix $(srcdir)/binutils/binutils/,$(addsuffix .applied,$(patch_files))) cd $(srcdir)/binutils/binutils/ && \ $(fix_config_guess_and_sub) touch $@ diff --git a/binutils/patches/00-bfd-config-bfd.patch b/binutils/patches/00-bfd-config-bfd.patch new file mode 100644 index 0000000..b6a0a44 --- /dev/null +++ b/binutils/patches/00-bfd-config-bfd.patch @@ -0,0 +1,20 @@ +#! /bin/sh +patch -p1 -f $* < $0 +exit $? + +Tweak the configuration. + +--- binutils/bfd/config.bfd~ 2008-04-16 20:02:01.000000000 +0200 ++++ binutils/bfd/config.bfd 2008-11-18 15:25:02.000000000 +0100 +@@ -614,6 +614,11 @@ case "${targ}" in + targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec bfd_efi_bsdrv_ia32_vec bfd_efi_rtdrv_ia32_vec bfd_efi_app_x86_64_vec bfd_efi_bsdrv_x86_64_vec bfd_efi_rtdrv_x86_64_vec" + want64=true + ;; ++ x86_64-*-gnu*) ++ targ_defvec=bfd_elf64_x86_64_vec ++ targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec bfd_efi_bsdrv_ia32_vec bfd_efi_rtdrv_ia32_vec bfd_efi_app_x86_64_vec bfd_efi_bsdrv_x86_64_vec bfd_efi_rtdrv_x86_64_vec" ++ want64=true ++ ;; + x86_64-*-mingw*) + targ_defvec=x86_64pe_vec + targ_selvecs="x86_64pe_vec x86_64pei_vec bfd_elf64_x86_64_vec" diff --git a/binutils/patches/01-ld-configure-tgt.patch b/binutils/patches/01-ld-configure-tgt.patch new file mode 100644 index 0000000..9056dc8 --- /dev/null +++ b/binutils/patches/01-ld-configure-tgt.patch @@ -0,0 +1,19 @@ +#! /bin/sh +patch -p1 -f $* < $0 +exit $? + +Tweak the configuration. + +--- binutils/ld/configure.tgt~ 2008-08-09 07:35:13.000000000 +0200 ++++ binutils/ld/configure.tgt 2008-11-18 15:39:17.000000000 +0100 +@@ -201,6 +201,10 @@ x86_64-*-linux-*) targ_emul=elf_x86_64 + targ_extra_libpath=elf_i386 + tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'` + tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; ++x86_64-*-gnu*) targ_emul=elf_x86_64 ++ targ_extra_emuls="elf_i386" ++ targ_extra_libpath=elf_i386 ++ tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;; + i[3-7]86-*-sysv[45]*) targ_emul=elf_i386 ;; + i[3-7]86-*-solaris2*) targ_emul=elf_i386_ldso + targ_extra_emuls="elf_i386 elf_x86_64" diff --git a/configure.ac b/configure.ac index 52604d7..aaa6bb0 100644 --- a/configure.ac +++ b/configure.ac @@ -115,15 +115,16 @@ AC_CANONICAL_HOST # Checks for header files. arch_ia32=false +arch_x86_64=false arch_powerpc=false case $host_cpu in alpha) arch=alpha arch_alpha=true ;; - amd64) - arch=amd64 - arch_amd64=true + x86_64) + arch=x86_64 + arch_x86_64=true ;; i386 | i486 | i586 | i686) arch=ia32 @@ -146,7 +147,7 @@ case $host_cpu in ;; esac AM_CONDITIONAL([ARCH_ALPHA], $arch_alpha) -AM_CONDITIONAL([ARCH_AMD64], $arch_amd64) +AM_CONDITIONAL([ARCH_X86_64], $arch_x86_64) AM_CONDITIONAL([ARCH_IA32], $arch_ia32) AM_CONDITIONAL([ARCH_IA64], $arch_ia64) AM_CONDITIONAL([ARCH_POWERPC], $arch_powerpc) @@ -315,7 +316,7 @@ AC_CONFIG_FILES([Makefile libl4/x2/Makefile libl4/tests/Makefile libl4/Makefile libviengoos/Makefile - platform/alpha/Makefile platform/amd64/Makefile + platform/alpha/Makefile platform/x86_64/Makefile platform/ia32/Makefile platform/ia64/Makefile platform/powerpc/Makefile platform/powerpc64/Makefile platform/Makefile diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 03afc8b..7d39bd4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2008-11-19 Neal H. Walfield <neal@gnu.org> + + * configury2.patch: New file. + * Makefrag.am (gcc_patch_files): Add configury2.patch. + (gcc/gcc.build/configure.stamp): Only add --with-arch for x86 + machines. + 2008-12-04 Neal H. Walfield <neal@gnu.org> * Makefrag.am (gcc/gcc.build/configure.stamp): Disable c++. diff --git a/gcc/Makefrag.am b/gcc/Makefrag.am index d513ea8..d1ecc59 100644 --- a/gcc/Makefrag.am +++ b/gcc/Makefrag.am @@ -22,7 +22,8 @@ gcc_snapshot = $(addprefix ftp://ftp.gnu.org/gnu/gcc/gcc-$(gcc_version)/,$(1)) # Patches to apply to GCC's source tree. gcc_patch_files = \ - configury.patch + configury.patch \ + configury2.patch $(addprefix $(srcdir)/gcc/,$(gcc_tarballs)): $(srcdir)/gcc/%: cd $(srcdir)/gcc/ && \ @@ -61,6 +62,11 @@ gcc/gcc.build/configure.stamp: $(srcdir)/gcc/gcc/patch.stamp binutils/binutils.b rm -rf gcc/gcc.build mkdir -p gcc/gcc.build ( cd gcc/gcc.build && \ + case "$(host_alias)" in \ + i[34567]86-*-*) \ + extra_args=--with-arch=$(word 1,$(subst -, ,$(host_alias))) \ + ;; \ + esac && \ $(abs_srcdir)/gcc/gcc/configure \ --target=$(host_alias) \ --prefix='$(abs_top_builddir)' \ @@ -71,7 +77,7 @@ gcc/gcc.build/configure.stamp: $(srcdir)/gcc/gcc/patch.stamp binutils/binutils.b --without-headers \ --with-newlib \ --enable-languages=c \ - --with-arch=$(word 1,$(subst -, ,$(host_alias))) \ + $$extra_args \ ) touch $@ diff --git a/gcc/configury2.patch b/gcc/configury2.patch new file mode 100644 index 0000000..2443ff9 --- /dev/null +++ b/gcc/configury2.patch @@ -0,0 +1,25 @@ +#!/bin/sh + +patch -p0 -f "$@" < $0 +exit "$?" + + +Add x86_64 support. + +--- gcc/config.gcc~ 2008-11-03 12:51:22.000000000 +0100 ++++ gcc/config.gcc 2008-11-18 16:16:15.000000000 +0100 +@@ -1091,12 +1091,13 @@ i[34567]86-*-linux* | i[34567]86-*-kfree + # TODO. GNU/Hurd originally didn't have `t-dfprules'. + tmake_file="${tmake_file} i386/t-crtstuff i386/t-crtfm t-dfprules" + ;; +-x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu) ++x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu | x86_64-*-viengoos-gnu*) + tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h \ + i386/x86-64.h i386/linux64.h" + case ${target} in + x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h" ;; + x86_64-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h" ;; ++ x86_64-*-viengoos-gnu*) tm_file="${tm_file} gnu.h viengoos.h i386/viengoos.h" ;; + esac + tmake_file="${tmake_file} i386/t-linux64 i386/t-crtfm t-dfprules" + ;; diff --git a/libl4/ChangeLog b/libl4/ChangeLog index be01e5a..62a5ecf 100644 --- a/libl4/ChangeLog +++ b/libl4/ChangeLog @@ -1,3 +1,7 @@ +2008-11-19 Neal H. Walfield <neal@gnu.org> + + * headers.m4: Only link the header files if $ARCH is ia32. + 2008-12-04 Neal H. Walfield <neal@gnu.org> * l4/space.h: Don't include <assert.h>. diff --git a/libl4/headers.m4 b/libl4/headers.m4 index 48cf249..2b67d0d 100644 --- a/libl4/headers.m4 +++ b/libl4/headers.m4 @@ -10,86 +10,88 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -AC_CONFIG_LINKS([ - 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 +if test x$arch = xia32 then AC_CONFIG_LINKS([ - sysroot/include/l4/abi/bits/kip.h:libl4/v2/${arch}/l4/abi/bits/kip.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 ]) -fi - -if test x$l4_abi = xx2 -then - # AC_CONFIG_LINKS([]) - : -fi - + + if test x$l4_abi = xv2 + then + AC_CONFIG_LINKS([ + sysroot/include/l4/abi/bits/kip.h:libl4/v2/${arch}/l4/abi/bits/kip.h + ]) + fi + + if test x$l4_abi = xx2 + then + # AC_CONFIG_LINKS([]) + : + fi +fi
\ No newline at end of file diff --git a/libpthread/ChangeLog b/libpthread/ChangeLog index 4badb21..6a47452 100644 --- a/libpthread/ChangeLog +++ b/libpthread/ChangeLog @@ -1,3 +1,15 @@ +2008-11-19 Neal H. Walfield <neal@gnu.org> + + * sysdeps/generic/bits/memory.h: New file. + * sysdeps/generic/bits/spin-lock-inline.h: Likewise. + * sysdeps/generic/bits/spin-lock.h: Likewise. + * headers.m4: Link sysroot/include/bits/memory.h to + libpthread/sysdeps/generic/bits/memory.h, + sysroot/include/bits/spin-lock.h to + libpthread/sysdeps/generic/bits/spin-lock.h, and + sysroot/include/bits/spin-lock-inline.h to + libpthread/sysdeps/generic/bits/spin-lock-inline.h. + 2008-12-17 Neal H. Walfield <neal@gnu.org> * sysdeps/viengoos/pt-block.c (__pthread_block): Use diff --git a/libpthread/headers.m4 b/libpthread/headers.m4 index 2289811..7c73cf2 100644 --- a/libpthread/headers.m4 +++ b/libpthread/headers.m4 @@ -14,9 +14,9 @@ AC_CONFIG_LINKS([ sysroot/include/pthread.h:libpthread/include/pthread.h sysroot/include/pthread/pthread.h:libpthread/include/pthread/pthread.h sysroot/include/pthread/pthreadtypes.h:libpthread/include/pthread/pthreadtypes.h - sysroot/include/bits/memory.h:libpthread/sysdeps/${arch}/bits/memory.h - sysroot/include/bits/spin-lock.h:libpthread/sysdeps/${arch}/bits/spin-lock.h - sysroot/include/bits/spin-lock-inline.h:libpthread/sysdeps/${arch}/bits/spin-lock-inline.h + sysroot/include/bits/memory.h:libpthread/sysdeps/generic/bits/memory.h + sysroot/include/bits/spin-lock.h:libpthread/sysdeps/generic/bits/spin-lock.h + sysroot/include/bits/spin-lock-inline.h:libpthread/sysdeps/generic/bits/spin-lock-inline.h sysroot/include/bits/barrier-attr.h:libpthread/sysdeps/generic/bits/barrier-attr.h sysroot/include/bits/barrier.h:libpthread/sysdeps/generic/bits/barrier.h sysroot/include/bits/cancelation.h:libpthread/sysdeps/generic/bits/cancelation.h diff --git a/platform/ChangeLog b/platform/ChangeLog index 8b46776..b8c833a 100644 --- a/platform/ChangeLog +++ b/platform/ChangeLog @@ -1,3 +1,17 @@ +2008-11-19 Neal H. Walfield <neal@gnu.org> + + * Makefile.am (ARCH_SUBDIR) [ARCH_X86_64]: Set to x86_64. + * amd64/Makefile.am: Move from here... + * x86_64/Makefile.am: ... to here. + * amd64/bits/atomic.h: Move from here... + * x86_64/bits/atomic.h: ... to here. + * amd64/bits/endian.h: Move from here... + * x86_64/bits/endian.h: ... to here. + * amd64/bits/wordsize.h: Move from here... + * x86_64/bits/wordsize.h: ... to here. + * amd64/sys/io.h: Move from here... + * x86_64/sys/io.h: ... to here. + 2008-05-29 Thomas Schwinge <tschwinge@gnu.org> * headers.m4: Link files into `sysroot/include/' instead of `include/'. diff --git a/platform/Makefile.am b/platform/Makefile.am index 3d2b052..8458d40 100644 --- a/platform/Makefile.am +++ b/platform/Makefile.am @@ -21,8 +21,8 @@ if ARCH_ALPHA ARCH_SUBDIR = alpha endif -if ARCH_AMD64 - ARCH_SUBDIR = amd64 +if ARCH_X86_64 + ARCH_SUBDIR = x86_64 endif if ARCH_IA32 ARCH_SUBDIR = ia32 diff --git a/platform/amd64/Makefile.am b/platform/x86_64/Makefile.am index b9af332..b9af332 100644 --- a/platform/amd64/Makefile.am +++ b/platform/x86_64/Makefile.am diff --git a/platform/amd64/bits/atomic.h b/platform/x86_64/bits/atomic.h index 133a68d..133a68d 100644 --- a/platform/amd64/bits/atomic.h +++ b/platform/x86_64/bits/atomic.h diff --git a/platform/amd64/bits/endian.h b/platform/x86_64/bits/endian.h index 2f59ead..2f59ead 100644 --- a/platform/amd64/bits/endian.h +++ b/platform/x86_64/bits/endian.h diff --git a/platform/amd64/bits/wordsize.h b/platform/x86_64/bits/wordsize.h index a40a0d8..a40a0d8 100644 --- a/platform/amd64/bits/wordsize.h +++ b/platform/x86_64/bits/wordsize.h diff --git a/platform/amd64/sys/io.h b/platform/x86_64/sys/io.h index 802a0df..802a0df 100644 --- a/platform/amd64/sys/io.h +++ b/platform/x86_64/sys/io.h |