aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/as.h12
2 files changed, 15 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 588b479..8983742 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 8 17:27:17 1995 Ken Raeburn <raeburn@cygnus.com>
+
+ * as.h (alloca): If __STDC__, declare void* instead of char*.
+
Tue Aug 8 13:07:05 1995 Ian Lance Taylor <ian@cygnus.com>
* config/tc-m68k.c (archs): Add 68ec000, 68hc000, 68hc001,
diff --git a/gas/as.h b/gas/as.h
index 252106c..5c9aeed 100644
--- a/gas/as.h
+++ b/gas/as.h
@@ -15,7 +15,7 @@
You should have received a copy of the GNU General Public License
along with GAS; see the file COPYING. If not, write to
- the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#ifndef GAS
#define GAS 1
@@ -43,6 +43,9 @@
/* Added #undef for DJ Delorie. The right fix is to ensure that as.h
is included first, before even any system header files, in all files
that use it. KR 1994.11.03 */
+/* Added void* version for STDC case. This is to be compatible with
+ the declaration in bison.simple, used for m68k operand parsing.
+ --KR 1995.08.08 */
/* AIX requires this to be the first thing in the file. */
#ifdef __GNUC__
@@ -56,7 +59,11 @@
#pragma alloca
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
+# ifndef __STDC__
char *alloca ();
+# else
+void *alloca ();
+# endif
# endif
# endif
# endif
@@ -480,6 +487,9 @@ COMMON unsigned char flag_warn_displacement; /* -K */
/* True if local symbols should be retained. */
COMMON unsigned char flag_keep_locals; /* -L */
+/* True if we are assembling using MRI syntax. */
+COMMON int flag_mri;
+
/* Should the data section be made read-only and appended to the text
section? */
COMMON unsigned char flag_readonly_data_in_text; /* -R */