hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-01 00:18:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sync to PK's latest version. I know that this is in /usr/src, the bloody

Browse Source 
patch file had absolute pathnames in it and went and patched /usr/src directly
(first time this has happened, I'll watch for it now), so I thought I might
as well just commit it and clean up the .orig files and whatnot left behind.
Sorry - this is the first time this has happened to me.  Very confusing.
This commit is contained in:
Jordan K. Hubbard 1993-12-12 17:01:24 +00:00
parent 20a2916818
commit 05388a353b
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/usr.bin/as/read.c
View File

@ -19,7 +19,7 @@
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifndef lint
static char rcsid[] = "$Id: read.c,v 1.2 1993/11/03 00:52:11 paul Exp $";
static char rcsid[] = "$Id: read.c,v 1.3 1993/11/30 20:55:43 jkh Exp $";
#endif
#define MASK_CHAR (0xFF) /* If your chars aren't 8 bits, you will
@ -1136,6 +1136,7 @@ void s_size() {
expressionS *exp;
segT seg;
SKIP_WHITESPACE();
name = input_line_pointer;
c = get_symbol_end();
/* just after name is now '\0' */
@ -1187,6 +1188,7 @@ void s_type() {
register symbolS *symbolP;
int aux;
SKIP_WHITESPACE();
name = input_line_pointer;
c = get_symbol_end();
/* just after name is now '\0' */

24
gnu/usr.bin/as/write.c
View File

@ -21,7 +21,7 @@
/* This thing should be set up to do byteordering correctly. But... */
#ifndef lint
static char rcsid[] = "$Id: write.c,v 1.2 1993/11/03 00:52:28 paul Exp $";
static char rcsid[] = "$Id: write.c,v 1.3 1993/11/30 20:55:47 jkh Exp $";
#endif
#include "as.h"
@ -1007,11 +1007,6 @@ segT this_segment_type; /* N_TYPE bits for segment. */
add_symbolP = NULL;
fixP->fx_addsy = NULL;
#ifdef PIC
add_symbolP = fixP->fx_addsy = fixP->fx_gotsy;
if (add_symbolP)
add_symbol_segment = S_GET_SEGMENT(add_symbolP);
#endif
} else {
/* Different segments in subtraction. */
know(!(S_IS_EXTERNAL(sub_symbolP) && (S_GET_SEGMENT(sub_symbolP) == SEG_ABSOLUTE)));
@ -1026,6 +1021,20 @@ segT this_segment_type; /* N_TYPE bits for segment. */
}
} /* if sub_symbolP */
#ifdef PIC
/*
* Bring _GLOBAL_OFFSET_TABLE_ forward, now we've had the
* chance to collapse any accompanying symbols into a number.
* This is the sequel of the hack in expr.c to parse operands
* of the form `_GLOBAL_OFFSET_TABLE_+(L1-L2)'. Note that
* _GLOBAL_OFFSET_TABLE_ can only be an "add symbol".
*/
if (add_symbolP == NULL && fixP->fx_gotsy != NULL) {
add_symbolP = fixP->fx_addsy = fixP->fx_gotsy;
add_symbol_segment = S_GET_SEGMENT(add_symbolP);
}
#endif
if (add_symbolP) {
if (add_symbol_segment == this_segment_type && pcrel) {
/*
@ -1065,8 +1074,11 @@ segT this_segment_type; /* N_TYPE bits for segment. */
*/
if (!flagseen['k'] ||
(fixP->fx_r_type != RELOC_GLOB_DAT &&
#ifdef TC_I386
/* XXX - This must be rationalized */
fixP->fx_r_type != RELOC_GOT &&
fixP->fx_r_type != RELOC_GOTOFF &&
#endif
(fixP->fx_r_type != RELOC_32 ||
!S_IS_EXTERNAL(add_symbolP))))
#endif