Solaris 11.4 ld build failure

/usr/include/sys/mman.h:81:0: note: this is the location of the previous definition
 #define SHARED  0x10

	PR 27064
	* deffilep.y (SHARED_K): Rename from SHARED.  Update uses.
This commit is contained in:
Alan Modra
2020-12-14 11:44:43 +10:30
parent f7c54040d7
commit 6abe7848fa
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2020-12-14 Alan Modra <amodra@gmail.com>
PR 27064
* deffilep.y (SHARED_K): Rename from SHARED. Update uses.
2020-12-05 Maciej W. Rozycki <macro@linux-mips.org> 2020-12-05 Maciej W. Rozycki <macro@linux-mips.org>
* testsuite/ld-vax-elf/got-local-exe-off-hidden.dd: New test * testsuite/ld-vax-elf/got-local-exe-off-hidden.dd: New test

View File

@ -122,7 +122,7 @@ static const char *lex_parse_string_end = 0;
%token NAME LIBRARY DESCRIPTION STACKSIZE_K HEAPSIZE CODE DATAU DATAL %token NAME LIBRARY DESCRIPTION STACKSIZE_K HEAPSIZE CODE DATAU DATAL
%token SECTIONS EXPORTS IMPORTS VERSIONK BASE CONSTANTU CONSTANTL %token SECTIONS EXPORTS IMPORTS VERSIONK BASE CONSTANTU CONSTANTL
%token PRIVATEU PRIVATEL ALIGNCOMM %token PRIVATEU PRIVATEL ALIGNCOMM
%token READ WRITE EXECUTE SHARED NONAMEU NONAMEL DIRECTIVE EQUAL %token READ WRITE EXECUTE SHARED_K NONAMEU NONAMEL DIRECTIVE EQUAL
%token <id> ID %token <id> ID
%token <digits> DIGITS %token <digits> DIGITS
%type <number> NUMBER %type <number> NUMBER
@ -235,7 +235,7 @@ attr:
READ { $$ = 1;} READ { $$ = 1;}
| WRITE { $$ = 2;} | WRITE { $$ = 2;}
| EXECUTE { $$=4;} | EXECUTE { $$=4;}
| SHARED { $$=8;} | SHARED_K { $$=8;}
; ;
@ -263,7 +263,7 @@ keyword_as_name: BASE { $$ = "BASE"; }
| PRIVATEU { $$ = "PRIVATE"; } | PRIVATEU { $$ = "PRIVATE"; }
| PRIVATEL { $$ = "private"; } | PRIVATEL { $$ = "private"; }
| READ { $$ = "READ"; } | READ { $$ = "READ"; }
| SHARED { $$ = "SHARED"; } | SHARED_K { $$ = "SHARED"; }
| STACKSIZE_K { $$ = "STACKSIZE"; } | STACKSIZE_K { $$ = "STACKSIZE"; }
| VERSIONK { $$ = "VERSION"; } | VERSIONK { $$ = "VERSION"; }
| WRITE { $$ = "WRITE"; } | WRITE { $$ = "WRITE"; }
@ -1323,7 +1323,7 @@ tokens[] =
{ "READ", READ }, { "READ", READ },
{ "SECTIONS", SECTIONS }, { "SECTIONS", SECTIONS },
{ "SEGMENTS", SECTIONS }, { "SEGMENTS", SECTIONS },
{ "SHARED", SHARED }, { "SHARED", SHARED_K },
{ "STACKSIZE", STACKSIZE_K }, { "STACKSIZE", STACKSIZE_K },
{ "VERSION", VERSIONK }, { "VERSION", VERSIONK },
{ "WRITE", WRITE }, { "WRITE", WRITE },