This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[VMS] Update VMS scripts in bfd


Hi,

this patch updates the VMS specific scripts and makefile in bfd to match changes of UNIX ones.
In that process, I have also removed various macros in hosts/alphavms.h that aren't required
anymore.

Committed on trunk.

Tristan.

bfd/
2013-07-09  Tristan Gingold  <gingold@adacore.com>

	* 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.


Index: configure.com
===================================================================
RCS file: /cvs/src/src/bfd/configure.com,v
retrieving revision 1.7
diff -c -r1.7 configure.com
*** configure.com	17 Dec 2012 16:55:37 -0000	1.7
--- configure.com	9 Jul 2013 06:56:15 -0000
***************
*** 44,69 ****
  !
  !
     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));
--- 44,53 ----
***************
*** 98,124 ****
     IF match_pos <> 0 THEN;
        POSITION(BEGINNING_OF(match_pos));
        ERASE(match_pos);
!       COPY_TEXT('__DECC');
!       SPLIT_LINE;
!       COPY_TEXT('#include <ints.h>');
     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');
     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');
     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');
     ENDIF;
     match_pos := SEARCH_QUIETLY('@bfd_file_ptr@', FORWARD, EXACT, rang);
     IF match_pos <> 0 THEN;
--- 82,106 ----
     IF match_pos <> 0 THEN;
        POSITION(BEGINNING_OF(match_pos));
        ERASE(match_pos);
!       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');
     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('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('unsigned __int64');
     ENDIF;
     match_pos := SEARCH_QUIETLY('@bfd_file_ptr@', FORWARD, EXACT, rang);
     IF match_pos <> 0 THEN;
***************
*** 158,183 ****
  !
  !
     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));
--- 140,149 ----
***************
*** 229,239 ****
     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;
--- 195,205 ----
     set (success,off);
     vfile := CREATE_BUFFER("vfile", "configure.in");
     rang := CREATE_RANGE(BEGINNING_OF(vfile), END_OF(vfile));
!    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-"])";
     ELSE;
       vers := "unknown";
     ENDIF;
***************
*** 340,345 ****
--- 306,325 ----
  #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,389 ****
     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
--- 361,366 ----
Index: makefile.vms
===================================================================
RCS file: /cvs/src/src/bfd/makefile.vms,v
retrieving revision 1.11
diff -c -r1.11 makefile.vms
*** makefile.vms	17 Dec 2012 16:55:38 -0000	1.11
--- makefile.vms	9 Jul 2013 06:56:15 -0000
***************
*** 24,30 ****
  
  ifeq ($(ARCH),IA64)
  HOSTFILE=alphavms.h
! OBJS:=cpu-ia64.obj,elf64-ia64.obj,elfxx-ia64.obj,elf64-ia64.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",\
--- 24,30 ----
  
  ifeq ($(ARCH),IA64)
  HOSTFILE=alphavms.h
! 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",\
Index: hosts/alphavms.h
===================================================================
RCS file: /cvs/src/src/bfd/hosts/alphavms.h,v
retrieving revision 1.9
diff -c -r1.9 alphavms.h
*** hosts/alphavms.h	2 Sep 2009 07:18:38 -0000	1.9
--- hosts/alphavms.h	9 Jul 2013 06:56:15 -0000
***************
*** 21,26 ****
--- 21,33 ----
     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 <stddef.h>
  #include <fcntl.h>
  #include <errno.h>
***************
*** 34,65 ****
  #include <unixio.h>
  #include <time.h>
  
- #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
--- 41,47 ----


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]