removed struct lbfile member "unsigned int type;", added by mistake

[fw/sdcc] / as / link / aslink.h

diff --git a/as/link/aslink.h b/as/link/aslink.h
index b3d0adfa2762b0fe3d260c01ea2a499e2645aef8..3fc0c7528afea950d5e5f8f140ea75e10cc93fc3 100644 (file)
--- a/as/link/aslink.h
+++ b/as/link/aslink.h
@@ -22,6 +22,8 @@
  * Extensions: P. Felber
  */
 
+#include "asxxxx_config.h"
+
 #define VERSION "V01.75 + NoICE + SDCC Feb 1999"
 
 /*
@@ -56,29 +58,40 @@
         $(STACK) = 2000
 */
 
+#if defined  decus
 /* DECUS C void definition */
 /* File/extension seperator */
 
-#ifdef  decus
-#define VOID    char
-#define FSEPX   '.'
-#endif
+#define VOID        char
+#define FSEPX       '.'
 
+#elif defined  PDOS
 /* PDOS C void definition */
 /* File/extension seperator */
 
-#ifdef  PDOS
-#define VOID    char
-#define FSEPX   ':'
-#endif
+#define VOID        char
+#define FSEPX       ':'
+
+#elif defined UNIX
+/* UNIX void definition */
+/* File/extension seperator */
 
-/* Default void definition */
+#define VOID        void
+#define FSEPX       '.'
+#define LKDIRSEP    '/'
+#define LKDIRSEPSTR "/"
+#define OTHERSYSTEM
+
+#else
+/* DOS/WINDOWS void definition */
 /* File/extension seperator */
 
-#ifndef VOID
-#define VOID    void
-#define FSEPX   '.'
+#define VOID        void
+#define FSEPX       '.'
+#define LKDIRSEP    '\\'
+#define LKDIRSEPSTR "\\"
 #define OTHERSYSTEM
+
 #endif
 
 /*
@@ -94,6 +107,12 @@
  #endif
 #endif
 
+#ifdef SDK
+    #define LKOBJEXT "o"
+#else /* SDK */
+    #define LKOBJEXT "rel"
+#endif /* SDK */
+
 /*
  * This file defines the format of the
  * relocatable binary file.
@@ -278,8 +297,10 @@ struct  area
         Addr_T  a_size;         /* Total size of the area */
         Addr_T  a_unaloc;       /* Total number of unallocated bytes, for error reporting */
         char    a_type;         /* Area subtype */
-        char    a_flag;         /* Flag byte */
+        int     a_flag;         /* Flag byte */
         char    a_id[NCPS];     /* Name */
+        char    *a_image;       /* Something for hc08/lkelf */
+        char    *a_used;        /* Something for hc08/lkelf */
 };
 
 /*
@@ -800,8 +821,8 @@ extern  VOID            s19();
 
 /* lkihx.c */
 extern  VOID            ihx();
-extern  VOID            ihxEntendedLinearAddress(Addr_T);
-extern  VOID            newArea();
+extern  VOID            ihxExtendedLinearAddress(Addr_T);
+extern  VOID            ihxNewArea();
 
 /* lkstore.c */
 extern  char *          StoreString( char *str );