diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/runtime/aeshash.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 6bc3797e895..e51276861c6 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -78e3527fcaf4ffd33b22e39a56e5d076844302be +ac59bb383e1b446c68465af793722dd0e84abefb The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/aeshash.c b/libgo/runtime/aeshash.c index faa90e073fa..bdfea5f93fe 100644 --- a/libgo/runtime/aeshash.c +++ b/libgo/runtime/aeshash.c @@ -575,7 +575,10 @@ uintptr aeshashbody(void* p, uintptr seed, uintptr size, Slice aeskeysched) { #else // !defined(__i386__) && !defined(__x86_64__) -uintptr aeshashbody(void* p, uintptr seed, uintptr size, Slice aeskeysched) { +uintptr aeshashbody(void* p __attribute__((unused)), + uintptr seed __attribute__((unused)), + uintptr size __attribute__((unused)), + Slice aeskeysched __attribute__((unused))) { // We should never get here on a non-x86 system. runtime_throw("impossible call to aeshashbody"); } |