Module Name:    src
Committed By:   mrg
Date:           Mon May 18 21:28:10 UTC 2020

Modified Files:
        src/external/gpl3/gcc/dist/gcc/config/aarch64: driver-aarch64.c

Log Message:
fix build on netbsd-9 hosts.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
    src/external/gpl3/gcc/dist/gcc/config/aarch64/driver-aarch64.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/aarch64/driver-aarch64.c
diff -u src/external/gpl3/gcc/dist/gcc/config/aarch64/driver-aarch64.c:1.7 src/external/gpl3/gcc/dist/gcc/config/aarch64/driver-aarch64.c:1.8
--- src/external/gpl3/gcc/dist/gcc/config/aarch64/driver-aarch64.c:1.7	Tue Apr 28 03:00:23 2020
+++ src/external/gpl3/gcc/dist/gcc/config/aarch64/driver-aarch64.c	Mon May 18 21:28:10 2020
@@ -365,6 +365,7 @@ host_detect_local_cpu (int argc, const c
 	    {
 	      exts += "asimd ";
 	    }
+#ifdef ID_AA64ISAR0_EL1_RDM
           if (__SHIFTOUT(id.ac_aa64isar0, ID_AA64ISAR0_EL1_RDM) == ID_AA64ISAR0_EL1_RDM_SQRDML)
 	    {
 	      exts += "asimdrdm ";
@@ -377,6 +378,7 @@ host_detect_local_cpu (int argc, const c
 	    {
 	      exts += "asimdfml ";
 	    }
+#endif
           if (__SHIFTOUT(id.ac_aa64isar0, ID_AA64ISAR0_EL1_AES) == ID_AA64ISAR0_EL1_AES_AES)
 	    {
 	      exts += "aes ";
@@ -389,10 +391,12 @@ host_detect_local_cpu (int argc, const c
 	    {
 	      exts += "crc32 ";
 	    }
+#ifdef ID_AA64ISAR0_EL1_ATOMIC
           if (__SHIFTOUT(id.ac_aa64isar0, ID_AA64ISAR0_EL1_ATOMIC) == ID_AA64ISAR0_EL1_ATOMIC_SWP)
 	    {
 	      exts += "atomics ";
 	    }
+#endif
           if ((__SHIFTOUT(id.ac_aa64isar0, ID_AA64ISAR0_EL1_SHA1) & ID_AA64ISAR0_EL1_SHA1_SHA1CPMHSU) != 0)
 	    {
 	      exts += "sha1 ";
@@ -401,6 +405,7 @@ host_detect_local_cpu (int argc, const c
 	    {
 	      exts += "sha2 ";
 	    }
+#ifdef ID_AA64ISAR0_EL1_SHA2_SHA512HSU
           if ((__SHIFTOUT(id.ac_aa64isar0, ID_AA64ISAR0_EL1_SHA2) & ID_AA64ISAR0_EL1_SHA2_SHA512HSU) != 0)
 	    {
 	      exts += "sha512 ";
@@ -425,6 +430,7 @@ host_detect_local_cpu (int argc, const c
 	    {
 	      exts += "lrcpc ";
 	    }
+#endif
 
 	  strncpy(buf, exts.c_str(), sizeof(buf) - 1);
 	  buf[sizeof(buf) - 1] = '\0';

Reply via email to