*** make-gas.com-orig	Tue Oct  3 17:00:29 1989
--- make-gas.com	Tue Oct  3 17:04:20 1989
***************
*** 34,40 ****
  $ gcc/debug/define="VMS" gdb-lines.c
  $ gcc/debug/define="VMS" vax.c
  $ gcc/debug/define="VMS" atof-vax.c
! $ gcc/debug/define="VMS" vms.c
  $ Link:
  $ link/exec=gcc-as sys$input:/opt
  !
--- 34,40 ----
  $ gcc/debug/define="VMS" gdb-lines.c
  $ gcc/debug/define="VMS" vax.c
  $ gcc/debug/define="VMS" atof-vax.c
! $ gcc/debug/define=("VMS","error=as_fatal") vms.c
  $ Link:
  $ link/exec=gcc-as sys$input:/opt
  !
*** vax.c-orig	Tue Oct  3 17:00:52 1989
--- vax.c	Mon Oct  2 20:27:37 1989
***************
*** 3184,3189 ****
--- 3184,3193 ----
  		as_warn("I don't use an interpass file! -V ignored");
  		break;
  
+ #ifdef VMS
+ 	case '+':
+ 		break;
+ #endif
  	default:
  		return 0;
  
*** vms.c-orig	Fri Sep 22 01:26:52 1989
--- vms.c	Thu Oct 12 02:06:25 1989
***************
*** 66,72 ****
  VMS_Check_For_Main()
  {
    register symbolS *symbolP;
- #ifdef	HACK_DEC_C_STARTUP
    register struct frchain *frchainP;
    register fragS *fragP;
    register fragS **prev_fragPP;
--- 66,71 ----
***************
*** 73,88 ****
    register struct fix *fixP;
    register fragS *New_Frag;
    int i;
- #endif	HACK_DEC_C_STARTUP
  
    symbolP = (struct symbol *)symbol_find("_main");
    if (symbolP && (symbolP->sy_nlist.n_type == (N_TEXT | N_EXT))) {
! #ifndef	HACK_DEC_C_STARTUP
  	/*
  	 *	Remember the entry point symbol
  	 */
  	Entry_Point_Symbol = symbolP;
! #else	HACK_DEC_C_STARTUP
  	/*
  	 *	Scan all the fragment chains for the one with "_main"
  	 *	(Actually we know the fragment from the symbol, but we need
--- 72,87 ----
    register struct fix *fixP;
    register fragS *New_Frag;
    int i;
  
    symbolP = (struct symbol *)symbol_find("_main");
    if (symbolP && (symbolP->sy_nlist.n_type == (N_TEXT | N_EXT))) {
!       if (flagseen['+'] == FALSE) {
  	/*
  	 *	Remember the entry point symbol
  	 */
  	Entry_Point_Symbol = symbolP;
!       }
!       else {
  	/*
  	 *	Scan all the fragment chains for the one with "_main"
  	 *	(Actually we know the fragment from the symbol, but we need
***************
*** 247,253 ****
  		 */
  		if (frchainP) frchainP=frchainP->frch_next;
  	}
! #endif	HACK_DEC_C_STARTUP
    }
  }
  
--- 246,252 ----
  		 */
  		if (frchainP) frchainP=frchainP->frch_next;
  	}
!       }
    }
  }
  
***************
*** 478,484 ****
  				/*
  				 *	Error
  				 */
! 				printf(" ERROR, unknown type (%d)\n",
  						sp->sy_nlist.n_type);
  				break;
  		}
--- 477,485 ----
  				/*
  				 *	Error
  				 */
! 				/* STABS emitted by g++ */
! 				if (sp->sy_nlist.n_type != 22)
! 					printf(" ERROR, unknown type (%d)\n",
  						sp->sy_nlist.n_type);
  				break;
  		}
***************
*** 1176,1182 ****
  	 */
  	while(--cp1 >= Module_Name)
  		if (*cp1 == '.') *cp1 = 0;
! 	if (strlen(Module_Name) > 31) Module_Name[31] = 0;
  	PUT_COUNTED_STRING(Module_Name);
  	/*
  	 *	Module Version is "V1.0"
--- 1177,1187 ----
  	 */
  	while(--cp1 >= Module_Name)
  		if (*cp1 == '.') *cp1 = 0;
! 	if (strlen(Module_Name) > 31) {
! 		if (flagseen['+'])
! 			printf("gas: Module name truncated: %s\n", Module_Name);
! 		Module_Name[31] = 0;
! 	}
  	PUT_COUNTED_STRING(Module_Name);
  	/*
  	 *	Module Version is "V1.0"
***************
*** 1292,1297 ****
--- 1297,1306 ----
  			In++;
  		}
  	}
+ 
+ 	if (strlen(In) > 31 && flagseen['+'])
+ 		printf("gas: Symbol name truncated: %s\n", In);
+ 
  	/*
  	 *	Do the case conversion
  	 */
***************
*** 1309,1315 ****
--- 1318,1328 ----
  	/*
  	 *	If we saw a dollar sign, we don't do case hacking
  	 */
+ #ifdef NO_CASE_HACKING
+ 	Case_Hack_Bits = 0;
+ #else
  	if (Saw_Dollar) Case_Hack_Bits = 0;
+ #endif
  	/*
  	 *	If we have more than 23 characters and everything is lowercase
  	 *	we can insert the full 31 characters
***************
*** 1324,1331 ****
--- 1337,1348 ----
  			 *		Check up to 8 more characters
  			 *		and ensure that they are lowercase
  			 */
+ #ifdef NO_CASE_HACKING
+ 			i = 8;
+ #else
  			for(i = 0; (In[i] != 0) && (i < 8); i++)
  				if (isupper(In[i]) && !Saw_Dollar) break;
+ #endif
  			if ((i >= 8) || (In[i] == 0)) {
  				/*
  				 *	They are:  Copy up to 31 characters
***************
*** 2049,2055 ****
  	 */
  	while(--cp1 >= Module_Name)
  		if (*cp1 == '.') *cp1 = 0;
! 	if (strlen(Module_Name) > 31) Module_Name[31] = 0;
  	/*
  	 *	Arrange to store the data locally (leave room for size byte)
  	 */
--- 2066,2076 ----
  	 */
  	while(--cp1 >= Module_Name)
  		if (*cp1 == '.') *cp1 = 0;
! 	if (strlen(Module_Name) > 31) {
! 		if (flagseen['+'])
! 			printf("gas: Module name truncated: %s\n", Module_Name);
! 		Module_Name[31] = 0;
! 	}
  	/*
  	 *	Arrange to store the data locally (leave room for size byte)
  	 */