* as.h (volatile): Don't test or define here; not needed.

(alloca): Replace alloca-conf.h inclusion with code recommended in autoconf
documentation.  Include config.h first.

Makefile.in (INCLUDES): Deleted last patch (using -I..).

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 557b311309714feaef33aa5323427d54809f5570..9b23e6f99719a0cfb32df52c0fa93427e4118576 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,7 +1,6 @@
 Wed Aug 31 17:43:06 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
 
        * Makefile.in (prefix, exec_prefix): Use @-subtitutions.
-       (INCLUDES): Include "-I.." for libiberty/alloca-conf.h.
 
        * aclocal.m4 (AC_OUTPUT_LINKS): Deleted redefinition, since
        autoconf 1.109 has this fixed.
@@ -10,6 +9,10 @@ Wed Aug 31 17:43:06 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
        program.  Cache NEED_*_DECLARATION values.
        * configure, conf.in: Regenerated with a modified autoconf 1.109.
 
+       * as.h (volatile): Don't test or define here; not needed.
+       (alloca): Replace alloca-conf.h inclusion with code recommended in
+       autoconf documentation.  Include config.h first.
+
 Wed Aug 31 11:20:48 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
 
        * config/obj-coff.h (S_IS_DEFINED): Absolute symbols are defined

diff --git a/gas/Makefile.in b/gas/Makefile.in
index 86cdf83605b2d295763bc3a4176d9ca191ce4da5..2075b065a2a971d41ced3524728475696df1a6cb 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -267,7 +267,7 @@ LIBS = @OPCODES_LIB@ @BFDLIB@ $(LOCAL_LOADLIBES) ../libiberty/libiberty.a
 # Both . and srcdir are used, in that order,
 # so that tm.h and config.h will be found in the compilation
 # subdirectory rather than in the source directory.
-INCLUDES = -I. -I$(srcdir) -I../bfd -I.. -I$(srcdir)/config -I$(srcdir)/../include -I$(srcdir)/..
+INCLUDES = -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(srcdir)/../include -I$(srcdir)/..
 SUBDIR_INCLUDES = -I.. -I$(srcdir) -I$(srcdir)/config
 
 # Always use -I$(srcdir)/config when compiling.