From d9f4cebe4485ae50ef878b84324d66f234a4ceb3 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Fri, 5 Feb 2021 04:04:53 +0000 Subject: Fix build with Clang 11. https://github.com/battleblow/openjdk-jdk12u/commit/9e8e504992f95cc36c6dcd6e6f57ac18b58e0db5 https://github.com/battleblow/openjdk-jdk12u/commit/c525150ace8816c503ccc618ea5559d06c99bbcb https://github.com/battleblow/openjdk-jdk12u/commit/dc2d99a20d0eea8d79cb31960cb693b2a4a39a4b PR: 250270 --- java/openjdk12/files/patch-changeset-57932 | 44 ++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 java/openjdk12/files/patch-changeset-57932 (limited to 'java/openjdk12/files/patch-changeset-57932') diff --git a/java/openjdk12/files/patch-changeset-57932 b/java/openjdk12/files/patch-changeset-57932 new file mode 100644 index 000000000000..12acff8b6c8d --- /dev/null +++ b/java/openjdk12/files/patch-changeset-57932 @@ -0,0 +1,44 @@ +changeset: 57932:9e54ea7d9cd9 +user: qpzhang +date: Wed Feb 05 20:31:09 2020 +0800 +summary: 8238388: libj2gss/NativeFunc.o "multiple definition" link errors with GCC10 + +diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.c +--- src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 10:45:39 2020 +0100 ++++ src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 20:31:09 2020 +0800 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -27,6 +27,9 @@ + #include + #include "NativeFunc.h" + ++/* global GSS function table */ ++GSS_FUNCTION_TABLE_PTR ftab; ++ + /* standard GSS method names (ordering is from mapfile) */ + static const char RELEASE_NAME[] = "gss_release_name"; + static const char IMPORT_NAME[] = "gss_import_name"; +diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.h +--- src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 10:45:39 2020 +0100 ++++ src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 20:31:09 2020 +0800 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -277,6 +277,6 @@ + typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; + + /* global GSS function table */ +-GSS_FUNCTION_TABLE_PTR ftab; ++extern GSS_FUNCTION_TABLE_PTR ftab; + + #endif + -- cgit v1.2.3