diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2012-06-20 02:28:31 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-06-20 02:28:31 +0200 |
| commit | 0138137f1ccea480fe31cea3b63a81f96daeeaa7 (patch) | |
| tree | ffd88f1e805cd98152828c1598fc3255b3d22a9e /mach | |
| parent | 27fbc2008d4df23885d10f0877caf62ae2c22bb4 (diff) | |
| parent | dc665715841aea049480d9f75ace426419db1f8e (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
configure
configure.in
hurd/Makefile
nptl/sysdeps/pthread/bits/libc-lock.h
sysdeps/i386/configure
sysdeps/powerpc/powerpc32/configure
sysdeps/powerpc/powerpc64/configure
sysdeps/unix/sysv/linux/configure
sysdeps/unix/sysv/linux/configure.in
Diffstat (limited to 'mach')
| -rw-r--r-- | mach/Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/mach/Makefile b/mach/Makefile index ec33fa72d4..00de7a505e 100644 --- a/mach/Makefile +++ b/mach/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991,92,93,94,95,96,97,98,2001,02 +# Copyright (C) 1991,92,93,94,95,96,97,98,2001,02,12 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -27,7 +27,6 @@ include ../Makeconfig headers = mach_init.h mach.h mach_error.h mach-shortcuts.h mach/mach_traps.h \ $(interface-headers) mach/mach.h mach/mig_support.h mach/error.h \ $(lock-headers) machine-sp.h -distribute = thread_state.h lock = spin-solid spin-lock mutex-init mutex-solid lock-headers = lock-intern.h machine-lock.h spin-lock.h routines = $(mach-syscalls) $(mach-shortcuts) \ @@ -52,17 +51,11 @@ mach/memory_object_user.defs = mach/memory_object.defs user-interfaces := $(addprefix mach/,$(mach-interface-list) \ mach_port mach_host exc \ - )\ + )\ $(addprefix device/,device device_request) server-interfaces := mach/exc -# It is important that we do not use the wildcard function to expand -# `err_*.sub'. Leaving the wildcard allows Make-dist to find all matching -# files in all sysdep directories. -distribute += Machrules syscalls.awk shortcut.awk \ - errorlib.h err_*.sub errsystems.awk - # Clear any environment value. generated = |