diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | config.make.in | 1 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | libthreads/ChangeLog | 6 | ||||
| -rw-r--r-- | libthreads/Makefile | 4 |
5 files changed, 23 insertions, 4 deletions
@@ -4,6 +4,12 @@ Wed Sep 4 16:25:24 1996 Miles Bader <miles@gnu.ai.mit.edu> ($(addprefix $(includedir)/$(installhdrsubdir)/,$(installhdrs))): `$(includdir)' --> `$(includedir)' +Wed Sep 4 08:56:04 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * configure.in (asm_syntax): New variable, canonicalized from + host_cpu. AC_SUBST it. + * config.make.in (asm_syntax): New variable, from @asm_syntax@. + Sun Sep 1 14:03:20 1996 Miles Bader <miles@gnu.ai.mit.edu> * Makeconf ($(target): %$(target-suffix)): Add dependency on diff --git a/config.make.in b/config.make.in index 4dbe7513..173d72eb 100644 --- a/config.make.in +++ b/config.make.in @@ -2,6 +2,7 @@ # Machine architecture. machine = @host_cpu@ +asm_syntax = @asm_syntax@ # Prefix prepended to names of machine-independent installed files. prefix = @prefix@ diff --git a/configure.in b/configure.in index 2546be9b..f42f6e6e 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION([$Id: configure.in,v 1.7 1996/08/13 18:10:06 thomas Exp $]) +AC_REVISION([$Id: configure.in,v 1.8 1996/09/05 14:14:01 thomas Exp $]) AC_PREREQ(2.4) dnl Minimum Autoconf version required. AC_INIT(hurd/hurd_types.h) dnl A distinctive file to look for in srcdir. @@ -11,6 +11,14 @@ gnu*) ;; *) AC_MSG_ERROR([sorry, this is the gnu os, not $host_os]) ;; esac +case "$host_cpu" in +i[[3456]]86) + asm_syntax=i386 + ;; +*) AC_MSG_ERROR([unspported CPU type]) ;; +esac +AC_SUBST(asm_syntax) + AC_PROG_INSTALL AC_CHECK_TOOL(CC, gcc) diff --git a/libthreads/ChangeLog b/libthreads/ChangeLog index 19ad905f..ddf480ee 100644 --- a/libthreads/ChangeLog +++ b/libthreads/ChangeLog @@ -1,3 +1,9 @@ +Wed Sep 4 09:06:09 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (VPATH): Look in $(asm_syntax) instead of old + $(machine); Hurd configure now folds equivalent CPU types into + asm_syntax. + Thu Aug 29 12:50:37 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * i386/csw.S: Include <mach/i386/asm.h> instead of <i386/asm.h>. diff --git a/libthreads/Makefile b/libthreads/Makefile index d915751a..6ad84fa8 100644 --- a/libthreads/Makefile +++ b/libthreads/Makefile @@ -15,8 +15,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# This is currently i386 specific. XXX - dir := libthreads makemode := library @@ -37,7 +35,7 @@ libname = libthreads installhdrs = cthreads.h rwlock.h installhdrsubdir = . -VPATH += $(srcdir)/$(machine) +VPATH += $(srcdir)/$(asm_syntax) include ../Makeconf |