From 787548c84f60643c2a1c011a780ae86dc5df1cec Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Tue, 9 Jul 2013 07:03:53 +0000 Subject: [PATCH] 2013-07-09 Tristan Gingold * hosts/alphavms.h: Include config.h and ansidecl.h, remove useless macros. * configure.com: Adjust to match changes in configure. * makefile.vms (OBJS): Update list. --- bfd/ChangeLog | 7 +++++ bfd/configure.com | 63 ++++++++++++++------------------------------ bfd/hosts/alphavms.h | 32 +++++----------------- bfd/makefile.vms | 2 +- 4 files changed, 35 insertions(+), 69 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 9b048acecac..7ad4fda2e1d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2013-07-09 Tristan Gingold + + * hosts/alphavms.h: Include config.h and ansidecl.h, remove useless + macros. + * configure.com: Adjust to match changes in configure. + * makefile.vms (OBJS): Update list. + 2013-07-05 Tristan Gingold * coffcode.h (coff_write_object_contents): Use ".ovrflo" name for diff --git a/bfd/configure.com b/bfd/configure.com index 60a9bc345c0..e1c3242bc48 100644 --- a/bfd/configure.com +++ b/bfd/configure.com @@ -44,26 +44,10 @@ $DECK ! ! set (success,off); - vfile := CREATE_BUFFER("vfile", "CONFIGURE.IN"); - rang := CREATE_RANGE(BEGINNING_OF(vfile), END_OF(vfile)); - match_pos := SEARCH_QUIETLY('AM_INIT_AUTOMAKE(bfd, ', FORWARD, EXACT, rang); - IF match_pos <> 0 THEN; - POSITION(BEGINNING_OF(match_pos)); - ERASE(match_pos); - vers := CURRENT_LINE-")"; - ELSE; - vers := "unknown"; - ENDIF; file := CREATE_BUFFER("file", GET_INFO(COMMAND_LINE, "file_name")); rang := CREATE_RANGE(BEGINNING_OF(file), END_OF(file)); - match_pos := SEARCH_QUIETLY('@VERSION@', FORWARD, EXACT, rang); - IF match_pos <> 0 THEN; - POSITION(BEGINNING_OF(match_pos)); - ERASE(match_pos); - COPY_TEXT(vers); - ENDIF; match_pos := SEARCH_QUIETLY('@wordsize@', FORWARD, EXACT, rang); IF match_pos <> 0 THEN; POSITION(BEGINNING_OF(match_pos)); @@ -98,27 +82,25 @@ $DECK IF match_pos <> 0 THEN; POSITION(BEGINNING_OF(match_pos)); ERASE(match_pos); - COPY_TEXT('__DECC'); - SPLIT_LINE; - COPY_TEXT('#include '); + COPY_TEXT('1'); ENDIF; match_pos := SEARCH_QUIETLY('@BFD_HOST_64_BIT@', FORWARD, EXACT, rang); IF match_pos <> 0 THEN; POSITION(BEGINNING_OF(match_pos)); ERASE(match_pos); - COPY_TEXT('int64'); + COPY_TEXT('__int64'); ENDIF; match_pos := SEARCH_QUIETLY('@BFD_HOST_U_64_BIT@', FORWARD, EXACT, rang); IF match_pos <> 0 THEN; POSITION(BEGINNING_OF(match_pos)); ERASE(match_pos); - COPY_TEXT('uint64'); + COPY_TEXT('unsigned __int64'); ENDIF; match_pos := SEARCH_QUIETLY('@BFD_HOSTPTR_T@', FORWARD, EXACT, rang); IF match_pos <> 0 THEN; POSITION(BEGINNING_OF(match_pos)); ERASE(match_pos); - COPY_TEXT('uint64'); + COPY_TEXT('unsigned __int64'); ENDIF; match_pos := SEARCH_QUIETLY('@bfd_file_ptr@', FORWARD, EXACT, rang); IF match_pos <> 0 THEN; @@ -158,26 +140,10 @@ $DECK ! ! set (success,off); - vfile := CREATE_BUFFER("vfile", "CONFIGURE.IN"); - rang := CREATE_RANGE(BEGINNING_OF(vfile), END_OF(vfile)); - match_pos := SEARCH_QUIETLY('AM_INIT_AUTOMAKE(bfd, ', FORWARD, EXACT, rang); - IF match_pos <> 0 THEN; - POSITION(BEGINNING_OF(match_pos)); - ERASE(match_pos); - vers := CURRENT_LINE-")"; - ELSE; - vers := "unknown"; - ENDIF; file := CREATE_BUFFER("file", GET_INFO(COMMAND_LINE, "file_name")); rang := CREATE_RANGE(BEGINNING_OF(file), END_OF(file)); - match_pos := SEARCH_QUIETLY('@VERSION@', FORWARD, EXACT, rang); - IF match_pos <> 0 THEN; - POSITION(BEGINNING_OF(match_pos)); - ERASE(match_pos); - COPY_TEXT(vers); - ENDIF; match_pos := SEARCH_QUIETLY('@wordsize@', FORWARD, EXACT, rang); IF match_pos <> 0 THEN; POSITION(BEGINNING_OF(match_pos)); @@ -229,11 +195,11 @@ $DECK set (success,off); vfile := CREATE_BUFFER("vfile", "configure.in"); rang := CREATE_RANGE(BEGINNING_OF(vfile), END_OF(vfile)); - match_pos := SEARCH_QUIETLY('AM_INIT_AUTOMAKE(bfd, ', FORWARD, EXACT, rang); + match_pos := SEARCH_QUIETLY('AC_INIT([bfd], [', FORWARD, EXACT, rang); IF match_pos <> 0 THEN; POSITION(BEGINNING_OF(match_pos)); ERASE(match_pos); - vers := CURRENT_LINE-")"; + vers := CURRENT_LINE-"])"; ELSE; vers := "unknown"; ENDIF; @@ -340,6 +306,20 @@ $ create []config.h #define HAVE_UNISTD_H 1 /* Disable NLS */ #undef ENABLE_NLS +/* Name of package */ +#define PACKAGE "bfd" +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" +/* Define to the full name of this package. */ +#define PACKAGE_NAME "bfd" +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "bfd" +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "bfd" +/* Define to the home page for this package. */ +#define PACKAGE_URL "" +/* Define to the version of this package. */ +#define PACKAGE_VERSION "(package version)" $! $ write sys$output "Copy sysdep.h" $ copy [.hosts]alphavms.h sysdep.h @@ -381,9 +361,6 @@ $DECK WRITE_FILE(file, GET_INFO(COMMAND_LINE, "output_file")); QUIT $ EOD -$ write sys$output "Generate elf64-ia64.c from elfxx-ia64.c" -$ edit/tpu/nojournal/nosection/nodisplay/command=substxx.tpu - - []elfXX-ia64.c /output=[]elf64-ia64.c $ write sys$output "Generate elf64-target.h from elfxx-target.h" $ edit/tpu/nojournal/nosection/nodisplay/command=substxx.tpu - []elfXX-target.h /output=[]elf64-target.h diff --git a/bfd/hosts/alphavms.h b/bfd/hosts/alphavms.h index 2a3421200a1..8d21826f6ec 100644 --- a/bfd/hosts/alphavms.h +++ b/bfd/hosts/alphavms.h @@ -21,6 +21,13 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifdef PACKAGE +#error sysdep.h must be included in lieu of config.h +#endif + +#include "config.h" +#include "ansidecl.h" + #include #include #include @@ -34,32 +41,7 @@ #include #include -#include "bfd.h" #include "filenames.h" - -#ifndef BFD_HOST_64_BIT -/* Make the basic types 64-bit quantities on the host. - Also provide the support macros BFD needs. */ -# ifdef __GNUC__ -# define BFD_HOST_64_BIT long long -# else -# define BFD_HOST_64_BIT long -# endif -typedef unsigned BFD_HOST_64_BIT uint64_type; -typedef BFD_HOST_64_BIT int64_type; - -# define sprintf_vma(s,x) sprintf (s, "%016lx", x) /* BFD_HOST_64_BIT */ -# define fprintf_vma(f,x) fprintf (f, "%016lx", x) /* BFD_HOST_64_BIT */ - -# define BYTES_IN_PRINTF_INT 4 - -/* These must have type unsigned long because they are used as - arguments in printf functions. */ -# define uint64_typeLOW(x) ((unsigned long) (((x) & 0xffffffff))) /* BFD_HOST_64_BIT */ -# define uint64_typeHIGH(x) ((unsigned long) (((x) >> 32) & 0xffffffff)) /* BFD_HOST_64_BIT */ - -#endif /* BFD_HOST_64_BIT */ - #include "fopen-vms.h" #define NO_FCNTL 1 diff --git a/bfd/makefile.vms b/bfd/makefile.vms index 6d7b200311d..5534822cbb0 100644 --- a/bfd/makefile.vms +++ b/bfd/makefile.vms @@ -24,7 +24,7 @@ ifeq ($(ARCH),IA64) HOSTFILE=alphavms.h -OBJS:=cpu-ia64.obj,elf64-ia64.obj,elfxx-ia64.obj,elf64-ia64.obj,\ +OBJS:=cpu-ia64.obj,elfxx-ia64.obj,elf64-ia64-vms.obj,\ vms-misc.obj,vms-lib.obj,elf-strtab.obj,corefile.obj,stabs.obj,\ merge.obj,elf-eh-frame.obj,elflink.obj,elf-attrs.obj,dwarf1.obj,elf64.obj DEFS=SELECT_VECS="&bfd_elf64_ia64_vms_vec",\ -- 2.30.2