From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 30 May 2018 00:16:02 +0000 (+0000)
Subject: crypto/x509: specify path to AIX certificate file
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4ec2cf3bd042a43eed1b46f80449893d149c1a7c;p=gcc.git

crypto/x509: specify path to AIX certificate file

    Reviewed-on: https://go-review.googlesource.com/113179

From-SVN: r260908
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 319d2f5a49c..76b5e57589a 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-290c93f08f4456f0552b0764e28573164e47f259
+572b19513766e9e5cc4aa8d984a89c93880726ba
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/go/crypto/x509/root_aix.go b/libgo/go/crypto/x509/root_aix.go
index de5702de35d..4e7e9dde953 100644
--- a/libgo/go/crypto/x509/root_aix.go
+++ b/libgo/go/crypto/x509/root_aix.go
@@ -5,4 +5,6 @@
 package x509
 
 // Possible certificate files; stop after finding one.
-var certFiles []string
+var certFiles = []string{
+	"/var/ssl/certs/ca-bundle.crt",
+}