Add upstream patches to build with "-fno-common".

This is default with Clang 11 and GCC 10.

https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/41be6128f4c1
https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/d5c69bd5f7ad
This commit is contained in:
Jung-uk Kim
2020-08-19 22:40:04 +00:00
parent f2230368a8
commit d859457c02
4 changed files with 71 additions and 0 deletions

View File

@@ -0,0 +1,17 @@
--- jdk/src/solaris/native/java/lang/childproc.c.orig 2020-08-01 01:24:39 UTC
+++ jdk/src/solaris/native/java/lang/childproc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -33,6 +33,7 @@
#include "childproc.h"
+const char * const *parentPathv;
ssize_t
restartableWrite(int fd, const void *buf, size_t count)

View File

@@ -0,0 +1,18 @@
--- jdk/src/solaris/native/java/lang/childproc.h.orig 2020-08-01 01:24:39 UTC
+++ jdk/src/solaris/native/java/lang/childproc.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -119,7 +119,7 @@ typedef struct _SpawnInfo {
* The cached and split version of the JDK's effective PATH.
* (We don't support putenv("PATH=...") in native code)
*/
-const char * const *parentPathv;
+extern const char * const *parentPathv;
ssize_t restartableWrite(int fd, const void *buf, size_t count);
int restartableDup2(int fd_from, int fd_to);

View File

@@ -0,0 +1,19 @@
--- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c.orig 2020-08-01 01:24:39 UTC
+++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c
@@ -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
@@ -27,6 +27,9 @@
#include <stdlib.h>
#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";

View File

@@ -0,0 +1,17 @@
--- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h.orig 2020-08-01 01:24:39 UTC
+++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h
@@ -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 struct GSS_FUNCTION_TABLE {
typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
/* global GSS function table */
-GSS_FUNCTION_TABLE_PTR ftab;
+extern GSS_FUNCTION_TABLE_PTR ftab;
#endif