From cc9a3bd637082ba8a2ca35513b0995055109f04c Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Tue, 22 Dec 1992 23:37:36 +0000 Subject: [PATCH] * hosts/std-host.h: New file. Attempt at a generic/default set of definitions, to discourage porting to new hosts by copying. * hosts/news.h: Removed. * hosts/sparc.h: Use std-host.h. --- bfd/hosts/.Sanitize | 2 +- bfd/hosts/news.h | 69 ------------------- bfd/hosts/sparc.h | 138 ++------------------------------------ bfd/hosts/std-host.h | 156 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 161 insertions(+), 204 deletions(-) delete mode 100644 bfd/hosts/news.h create mode 100644 bfd/hosts/std-host.h diff --git a/bfd/hosts/.Sanitize b/bfd/hosts/.Sanitize index a02f2d57213..fa6da6f8e06 100644 --- a/bfd/hosts/.Sanitize +++ b/bfd/hosts/.Sanitize @@ -48,12 +48,12 @@ i386v4.h irix3.h irix4.h ncr3000.h -news.h rs6000.h rtbsd.h solaris2.h sparc-ll.h sparc.h +std-host.h stratus.h sun3.h sysv4.h diff --git a/bfd/hosts/news.h b/bfd/hosts/news.h deleted file mode 100644 index d42f90413c5..00000000000 --- a/bfd/hosts/news.h +++ /dev/null @@ -1,69 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#ifndef O_ACCMODE -#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) -#endif -#define SEEK_SET 0 -#define SEEK_CUR 1 - -extern int EXFUN(close,(int)); -extern int EXFUN(fcntl,(int des, int cmd, int e)); -extern int EXFUN(fprintf,(FILE *,char *,...)); -extern int EXFUN(printf,(char *,...)); -extern int EXFUN(qsort,(void *data,int els, int siz, int func())); -extern int EXFUN(fseek,(FILE*, int, int)); -extern int EXFUN(fclose,(FILE*)); -extern void EXFUN(bcopy,(char*,char*,int)); -extern int EXFUN(bcmp,(char *, char *, int)); -extern void EXFUN(bzero,(char *, int)); -extern void EXFUN(perror,(CONST char *)); -extern char *getenv(); -extern char * strchr(); -extern char *memchr(); -extern char *strrchr(); -extern int chmod(); -extern int fread(); -extern int fstat(); -extern int fwrite(); -extern int sscanf(); -extern int stat(); -extern int strtol(); -void free(); -char *malloc(); -char *realloc(); -extern char *strrchr(); -extern char *ctime(); -extern int _flsbuf(); -extern int fclose(); -extern int time(); -extern int utimes(); -extern int vfprintf(); -extern long atol(); -extern char *getenv(); -extern int fputc(); -extern int unlink(); - -#define HOST_BIG_ENDIAN_P - -/* EXACT TYPES */ -typedef char int8e_type; -typedef unsigned char uint8e_type; -typedef short int16e_type; -typedef unsigned short uint16e_type; -typedef int int32e_type; -typedef unsigned int uint32e_type; - -/* CORRECT SIZE OR GREATER */ -typedef char int8_type; -typedef unsigned char uint8_type; -typedef short int16_type; -typedef unsigned short uint16_type; -typedef int int32_type; -typedef unsigned int uint32_type; -#include "fopen-same.h" diff --git a/bfd/hosts/sparc.h b/bfd/hosts/sparc.h index 3ae9af69618..7b059027939 100644 --- a/bfd/hosts/sparc.h +++ b/bfd/hosts/sparc.h @@ -1,141 +1,11 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifndef O_ACCMODE -#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) -#endif -#define SEEK_SET 0 -#define SEEK_CUR 1 -#ifdef __STDC__ -#if __GNUC__ >= 2 +#define STDC_HEADERS +#if defined(__STDC__) && __GNUC__ >= 2 #define abort __hide_abort #define exit __hide_exit #endif -#include +#include "hosts/std-host.h" +#include #undef exit #undef abort -#include -#else -extern char *EXFUN(mktemp,(CONST char*)); -extern int EXFUN(fflush,(FILE *)); -extern int EXFUN(write,(int, CONST char *, int)); -extern int EXFUN(index,(CONST char *, char c)); -extern void EXFUN(abort,(void)); -extern int EXFUN(close,(int)); -extern int EXFUN(fcntl,(int des, int cmd, int e)); -extern int EXFUN(fprintf,(FILE *,char *,...)); -extern int EXFUN(printf,(char *,...)); -extern int EXFUN(qsort,(void *data,int els, int siz, int func())); -extern void EXFUN(exit,(int)); -extern int EXFUN(fseek,(FILE*, int, int)); -extern int EXFUN(fclose,(FILE*)); -extern void EXFUN(bcopy,(char*,char*,int)); -extern int EXFUN(bcmp,(char *, char *, int)); -extern void EXFUN(bzero,(char *, int)); -extern PTR EXFUN(memset,(PTR, int, int)); -extern void EXFUN(puts,(CONST char*)); -extern void EXFUN(fputs,(CONST char*,FILE*)); -extern int EXFUN(rmdir,(CONST char *)); -extern int EXFUN(getuid,(void)); -extern int EXFUN(getgid,(void)); -extern int EXFUN(rename,(CONST char *, CONST char*)); -extern int EXFUN(etuid,()); -extern int EXFUN(etgid,()); -extern void EXFUN(perror,(CONST char *)); -#ifndef DONTDECLARE_MALLOC -extern PTR EXFUN(malloc,(unsigned)); -extern PTR EXFUN(realloc, (PTR, unsigned)); -#endif - -#ifndef __GNUC__ -extern PTR EXFUN(memcpy,(PTR,CONST PTR,unsigned int)); -#else -/* char * EXFUN( memcpy,(char *,CONST char *,unsigned int)); */ -#endif - - -extern char * strchr(); -extern char *getenv(); -extern char *memchr(); -extern char *strrchr(); -extern int chmod(); -extern int fread(); -extern int fstat(); -extern int fwrite(); -extern int sscanf(); -extern int stat(); -extern int strtol(); -extern int EXFUN(free,(PTR)); - - -extern char *strrchr(); -extern char *ctime(); -extern int _flsbuf(); -extern int fclose(); -extern int time(); -extern int utimes(); -extern int vfprintf(); -extern long atol(); -extern char *getenv(); -extern int fputc(); -extern int unlink(); -#endif /* __STDC__ */ - -/* EXACT TYPES */ -typedef char int8e_type; -typedef unsigned char uint8e_type; -typedef short int16e_type; -typedef unsigned short uint16e_type; -typedef int int32e_type; -typedef unsigned int uint32e_type; - - -#ifdef __GNUC__ -typedef unsigned long long uint64e_type; - -#else -typedef struct { - uint32e_type low, high; -} uint64e_type; - -#endif -/* CORRECT SIZE OR GREATER */ -typedef char int8_type; -typedef unsigned char uint8_type; -typedef short int16_type; -typedef unsigned short uint16_type; -typedef int int32_type; -typedef unsigned int uint32_type; - -#ifdef __GNUC__ -typedef unsigned long long uint64_type; -typedef long long int64_type; -#else -typedef struct { - uint32e_type low, high; -} uint64_type; - -typedef struct { - uint32e_type low, high; -} int64_type; - -#endif - - -#define BYTES_IN_PRINTF_INT 4 -#ifndef __GNUC__ -#define uint64_typeLOW(x) (uint32_type)(((x).low)) -#define uint64_typeHIGH(x) (uint32_type)(((x).high)) -#else -#define uint64_typeLOW(x) (uint32_type)(((x) & 0xffffffff)) -#define uint64_typeHIGH(x) (uint32_type)(((x) >> 32) & 0xffffffff) -#endif -#include "fopen-same.h" diff --git a/bfd/hosts/std-host.h b/bfd/hosts/std-host.h new file mode 100644 index 00000000000..3dfbb3cf2f8 --- /dev/null +++ b/bfd/hosts/std-host.h @@ -0,0 +1,156 @@ +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef O_ACCMODE +#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) +#endif +#ifndef SEEK_SET +#define SEEK_SET 0 +#endif +#ifndef SEEK_CUR +#define SEEK_CUR 1 +#endif +#ifdef STDC_HEADERS +#include +/*#include */ +#else +extern char *EXFUN(mktemp,(CONST char*)); +extern int EXFUN(fflush,(FILE *)); +extern int EXFUN(write,(int, CONST char *, int)); +extern void EXFUN(abort,(void)); +extern int EXFUN(close,(int)); +extern int EXFUN(fcntl,(int des, int cmd, int e)); +extern int EXFUN(fprintf,(FILE *,char *,...)); +extern int EXFUN(printf,(char *,...)); +extern int EXFUN(qsort,(void *data,int els, int siz, int func())); +extern void EXFUN(exit,(int)); +extern int EXFUN(fseek,(FILE*, int, int)); +extern int EXFUN(fclose,(FILE*)); +extern void EXFUN(bcopy,(char*,char*,int)); +extern int EXFUN(bcmp,(char *, char *, int)); +extern void EXFUN(bzero,(char *, int)); +extern PTR EXFUN(memset,(PTR, int, int)); +extern void EXFUN(puts,(CONST char*)); +extern void EXFUN(fputs,(CONST char*,FILE*)); +extern int EXFUN(rmdir,(CONST char *)); +extern int EXFUN(getuid,(void)); +extern int EXFUN(getgid,(void)); +extern int EXFUN(rename,(CONST char *, CONST char*)); +extern int EXFUN(getuid,()); +extern int EXFUN(getgid,()); +extern void EXFUN(perror,(CONST char *)); +#ifndef DONTDECLARE_MALLOC +extern PTR EXFUN(malloc,(unsigned)); +extern PTR EXFUN(realloc, (PTR, unsigned)); +#endif + +#ifndef __GNUC__ +extern PTR EXFUN(memcpy,(PTR,CONST PTR,unsigned int)); +#else +/* char * EXFUN( memcpy,(char *,CONST char *,unsigned int)); */ +#endif + +#ifdef __STDC__ +extern void EXFUN(free,(PTR)); +#else +extern int free(); +#endif + +extern char * strchr(); +extern char *getenv(); +extern char *memchr(); +extern char *strrchr(); +extern int chmod(); +extern int fread(); +extern int fstat(); +extern int fwrite(); +extern int sscanf(); +extern int stat(); +extern int strtol(); + +extern char *strrchr(); +extern char *ctime(); +extern int _flsbuf(); +extern int fclose(); +extern int time(); +extern int utimes(); +extern int vfprintf(); +extern long atol(); +extern char *getenv(); +extern int fputc(); +extern int unlink(); +#endif /* __STDC__ */ + +/* EXACT TYPES */ +#ifndef int8e_type +#define int8e_type char +#endif +#ifndef uint8e_type +#define uint8e_type unsigned char +#endif +#ifndef int16e_type +#define int16e_type short +#endif +#ifndef uint16e_type +#define uint16e_type unsigned short +#endif +#ifndef int32e_type +#define int32e_type int +#endif +#ifndef uint32e_type +#define uint32e_type unsigned int +#endif +#ifndef uint64e_type +#ifdef __GNUC__ +#define uint64e_type unsigned long long +#define int64e_type struct long long +#define uint64_typeLOW(x) (uint32_type)(((x) & 0xffffffff)) +#define uint64_typeHIGH(x) (uint32_type)(((x) >> 32) & 0xffffffff) +#else +typedef struct uint64e_struct { + uint32e_type low, high; +}; +#define uint64e_type struct uint64e_struct +#define int64e_type struct uint64e_struct +#define uint64_typeLOW(x) (uint32_type)(((x).low)) +#define uint64_typeHIGH(x) (uint32_type)(((x).high)) +#endif +#endif + +/* CORRECT SIZE OR GREATER */ +#ifndef int8_type +#define int8_type int8e_type +#endif +#ifndef uint8_type +#define uint8_type uint8e_type +#endif +#ifndef int16_type +#define int16_type int16e_type +#endif +#ifndef uint16_type +#define uint16_type uint16e_type +#endif +#ifndef int32_type +#define int32_type int32e_type +#endif +#ifndef uint32_type +#define uint32_type uint32e_type +#endif +#ifndef int64_type +#define int64_type int64e_type +#endif +#ifndef uint64_type +#define uint64_type uint64e_type +#endif + +#ifndef BYTES_IN_PRINTF_INT +#define BYTES_IN_PRINTF_INT 4 +#endif + +#include "fopen-same.h" -- 2.30.2