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.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9e72b31c9fabea0d97180d25ac569337edff7295..0f5991356a9d547e42956b6d490e76e8683cc3e5 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -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>
 
        * testsuite/ld-vax-elf/got-local-exe-off-hidden.dd: New test

diff --git a/ld/deffilep.y b/ld/deffilep.y
index 51cb1d7fcde6d38160a9b8698b4324153fa50869..2f897453f49d083110b7332d481f075d2ee75967 100644 (file)
--- a/ld/deffilep.y
+++ b/ld/deffilep.y
@@ -122,7 +122,7 @@ static const char *lex_parse_string_end = 0;
 %token NAME LIBRARY DESCRIPTION STACKSIZE_K HEAPSIZE CODE DATAU DATAL
 %token SECTIONS EXPORTS IMPORTS VERSIONK BASE CONSTANTU CONSTANTL
 %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 <digits> DIGITS
 %type  <number> NUMBER
@@ -235,7 +235,7 @@ attr:
                READ    { $$ = 1;}
        |       WRITE   { $$ = 2;}
        |       EXECUTE { $$=4;}
-       |       SHARED  { $$=8;}
+       |       SHARED_K { $$=8;}
        ;
 
 
@@ -263,7 +263,7 @@ keyword_as_name: BASE { $$ = "BASE"; }
         | PRIVATEU { $$ = "PRIVATE"; }
         | PRIVATEL { $$ = "private"; }
         | READ { $$ = "READ"; }
-        | SHARED  { $$ = "SHARED"; }
+        | SHARED_K  { $$ = "SHARED"; }
         | STACKSIZE_K { $$ = "STACKSIZE"; }
         | VERSIONK { $$ = "VERSION"; }
         | WRITE { $$ = "WRITE"; }
@@ -1323,7 +1323,7 @@ tokens[] =
   { "READ", READ },
   { "SECTIONS", SECTIONS },
   { "SEGMENTS", SECTIONS },
-  { "SHARED", SHARED },
+  { "SHARED", SHARED_K },
   { "STACKSIZE", STACKSIZE_K },
   { "VERSION", VERSIONK },
   { "WRITE", WRITE },