Mercurial > hg > icedtea8-forest > jdk
changeset 14662:d5c69bd5f7ad
8238388: libj2gss/NativeFunc.o "multiple definition" link errors with GCC10
Summary: Fixed libj2gss link errors caused by GCC10 default -fno-common
Reviewed-by: weijun, sgehwolf
Contributed-by: Leslie Zhai <zhaixiang@loongson.cn>
author | qpzhang |
---|---|
date | Wed, 05 Feb 2020 20:31:09 +0800 |
parents | 41be6128f4c1 |
children | 655f1d059a8c |
files | src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h |
diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c Tue Feb 04 21:27:10 2020 +0800 +++ b/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c Wed Feb 05 20:31:09 2020 +0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, 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 @@ -28,6 +28,9 @@ #include <dlfcn.h> #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";
--- a/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h Tue Feb 04 21:27:10 2020 +0800 +++ b/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h Wed Feb 05 20:31:09 2020 +0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, 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 @@ -265,6 +265,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