Skip to content

Commit 32edcec

Browse files
authored
Merge pull request ppc64le#1001 from kandarpamalipeddi/kotlin-stdlib
Adding build scripts for Kotlin (stdlib & stdlib-common)
2 parents 66909c5 + f18d47c commit 32edcec

File tree

3 files changed

+395
-0
lines changed

3 files changed

+395
-0
lines changed

k/kotlin-stdlib/LICENSE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "{}"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright {yyyy} {name of copyright owner}
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# ----------------------------------------------------------------------------
2+
#
3+
# Package : Kotlin (stdlib & stdlib-common)
4+
# This script describes steps to build below packages
5+
# kotlin-stdlib-common-1.5.255-SNAPSHOT.jar
6+
# kotlin-stdlib-1.5.255-SNAPSHOT.jar
7+
# Version : 1.5.21
8+
# Source repo : https://github.com/JetBrains/kotlin.git
9+
# Tested on : rhel_8.3
10+
# Script License: Apache License, Version 2 or later
11+
# Maintainer : Kandarpa Malipeddi <[email protected]>
12+
#
13+
# Disclaimer: This script has been tested in root mode on given
14+
# ========== platform using the mentioned version of the package.
15+
# It may not work as expected with newer versions of the
16+
# package and/or distribution. In such case, please
17+
# contact "Maintainer" of this script.
18+
#
19+
# ----------------------------------------------------------------------------
20+
#!/bin/bash
21+
22+
set -e
23+
24+
VERSION=v1.5.21
25+
26+
if [ "X$1" != "X" ]
27+
then
28+
VERSION=$1
29+
fi
30+
31+
yum install -y wget git patch
32+
33+
useradd -G root -d /home/testuser testuser -p test123
34+
35+
su testuser
36+
cd
37+
38+
wget https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u302b08.tar.gz
39+
tar xf OpenJDK8U-jdk_ppc64le_linux_hotspot_8u302b08.tar.gz
40+
41+
wget https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jdk_ppc64le_linux_hotspot_9.0.4_11.tar.gz
42+
tar xf OpenJDK9U-jdk_ppc64le_linux_hotspot_9.0.4_11.tar.gz
43+
44+
rm -rf OpenJDK8U-jdk_ppc64le_linux_hotspot_8u302b08.tar.gz OpenJDK9U-jdk_ppc64le_linux_hotspot_9.0.4_11.tar.gz
45+
46+
export JAVA_HOME=$HOME/jdk8u302-b08
47+
export JDK_9=$HOME/jdk-9.0.4+11
48+
export JDK_16=$JAVA_HOME
49+
export JDK_17=$JAVA_HOME
50+
export JDK_18=$JAVA_HOME
51+
export PATH=$JAVA_HOME/bin:$PATH
52+
53+
wget https://raw.githubusercontent.com/ppc64le/build-scripts/master/k/kotlin-stdlib/v1.5.21/kotlin.patch
54+
55+
git clone https://github.com/JetBrains/kotlin.git
56+
cd kotlin
57+
git checkout $VERSION
58+
patch -p1 < $HOME/kotlin.patch
59+
60+
./gradlew :kotlin-stdlib-common:test
61+
./gradlew :kotlin-stdlib:test
62+
63+
echo "JARS at "
64+
find -name *kotlin-stdlib*SNAPSHOT.jar
Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
diff --git a/core/builtins/native/kotlin/Primitives.kt b/core/builtins/native/kotlin/Primitives.kt
2+
index 934879a9d54..c129483e492 100644
3+
--- a/core/builtins/native/kotlin/Primitives.kt
4+
+++ b/core/builtins/native/kotlin/Primitives.kt
5+
@@ -1096,7 +1096,7 @@ public class Float private constructor() : Number(), Comparable<Float> {
6+
/**
7+
* A constant holding the "not a number" value of Float.
8+
*/
9+
- public const val NaN: Float = -(0.0F/0.0F)
10+
+ public val NaN: Float = Math.sqrt(-1.0).toFloat()
11+
12+
/**
13+
* The number of bytes used to represent an instance of Float in a binary form.
14+
@@ -1347,7 +1347,7 @@ public class Double private constructor() : Number(), Comparable<Double> {
15+
/**
16+
* A constant holding the "not a number" value of Double.
17+
*/
18+
- public const val NaN: Double = -(0.0/0.0)
19+
+ public const val NaN: Double = Math.sqrt(-1.0)
20+
21+
/**
22+
* The number of bytes used to represent an instance of Double in a binary form.
23+
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/Primitives.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/Primitives.kt
24+
index 17268a00ba3..e921adac53c 100644
25+
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/Primitives.kt
26+
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/Primitives.kt
27+
@@ -1339,8 +1339,7 @@ public final class Float private constructor() : Number(), Comparable<Float> {
28+
/**
29+
* A constant holding the "not a number" value of Float.
30+
*/
31+
- @Suppress("DIVISION_BY_ZERO")
32+
- public const val NaN: Float = -(0.0f / 0.0f)
33+
+ public val NaN: Float = Math.sqrt(-1.0).toFloat()
34+
35+
/**
36+
* The number of bytes used to represent an instance of Float in a binary form.
37+
@@ -1646,7 +1645,7 @@ public final class Double private constructor() : Number(), Comparable<Double> {
38+
* A constant holding the "not a number" value of Double.
39+
*/
40+
@Suppress("DIVISION_BY_ZERO")
41+
- public const val NaN: Double = -(0.0 / 0.0)
42+
+ public val NaN: Double = Math.sqrt(-1.0)
43+
44+
/**
45+
* The number of bytes used to represent an instance of Double in a binary form.
46+
diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/Architecture.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/Architecture.kt
47+
index e4da328c65e..964deac4337 100644
48+
--- a/native/utils/src/org/jetbrains/kotlin/konan/target/Architecture.kt
49+
+++ b/native/utils/src/org/jetbrains/kotlin/konan/target/Architecture.kt
50+
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.konan.target
51+
52+
enum class Architecture(@Deprecated("Compare Architecture entries instead.") val bitness: Int) {
53+
X64(64),
54+
+ PPC64LE(64),
55+
X86(32),
56+
ARM64(64),
57+
ARM32(32),
58+
diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
59+
index fbaa207a277..4832babb93c 100644
60+
--- a/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
61+
+++ b/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
62+
@@ -57,7 +57,8 @@ open class HostManager(
63+
ANDROID_X64,
64+
ANDROID_ARM32,
65+
ANDROID_ARM64,
66+
- WASM32
67+
+ WASM32,
68+
+ LINUX_PPC64LE
69+
),
70+
MINGW_X64 to setOf(
71+
MINGW_X64,
72+
@@ -118,6 +119,10 @@ open class HostManager(
73+
ANDROID_ARM32,
74+
ANDROID_ARM64,
75+
WASM32
76+
+ ),
77+
+ LINUX_PPC64LE to setOf(
78+
+ LINUX_PPC64LE,
79+
+ LINUX_X64
80+
)
81+
)
82+
83+
@@ -125,7 +130,8 @@ open class HostManager(
84+
LINUX_X64 to setOf(MINGW_X86, MINGW_X64) + zephyrSubtargets,
85+
MACOS_X64 to setOf(MINGW_X86, MINGW_X64) + zephyrSubtargets,
86+
MINGW_X64 to setOf<KonanTarget>() + zephyrSubtargets,
87+
- MACOS_ARM64 to emptySet()
88+
+ MACOS_ARM64 to emptySet(),
89+
+ LINUX_PPC64LE to setOf(LINUX_PPC64LE, LINUX_X64) + zephyrSubtargets
90+
)
91+
92+
val enabledByHost: Map<KonanTarget, Set<KonanTarget>> by lazy {
93+
@@ -191,6 +197,7 @@ open class HostManager(
94+
"amd64" -> "x86_64"
95+
"arm64" -> "aarch64"
96+
"aarch64" -> "aarch64"
97+
+ "ppc64le" -> "ppc64le"
98+
else -> throw TargetSupportException("Unknown hardware platform: $javaArch")
99+
}
100+
}
101+
@@ -199,6 +206,7 @@ open class HostManager(
102+
Pair("osx", "x86_64") to MACOS_X64,
103+
Pair("osx", "aarch64") to MACOS_ARM64,
104+
Pair("linux", "x86_64") to LINUX_X64,
105+
+ Pair("linux", "ppc64le") to LINUX_PPC64LE,
106+
Pair("windows", "x86_64") to MINGW_X64
107+
)
108+
109+
diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt
110+
index 9a20be528f7..cf174e0fd7f 100644
111+
--- a/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt
112+
+++ b/native/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt
113+
@@ -35,6 +35,7 @@ sealed class KonanTarget(override val name: String, val family: Family, val arch
114+
object LINUX_MIPS32 : KonanTarget("linux_mips32", Family.LINUX, Architecture.MIPS32)
115+
object LINUX_MIPSEL32 : KonanTarget("linux_mipsel32", Family.LINUX, Architecture.MIPSEL32)
116+
object WASM32 : KonanTarget("wasm32", Family.WASM, Architecture.WASM32)
117+
+ object LINUX_PPC64LE : KonanTarget("linux_x64", Family.LINUX, Architecture.PPC64LE)
118+
119+
// Tunable targets
120+
class ZEPHYR(val subName: String, val genericName: String = "zephyr") :
121+
@@ -55,7 +56,8 @@ sealed class KonanTarget(override val name: String, val family: Family, val arch
122+
MINGW_X86, MINGW_X64,
123+
MACOS_X64, MACOS_ARM64,
124+
LINUX_ARM64, LINUX_ARM32_HFP, LINUX_MIPS32, LINUX_MIPSEL32,
125+
- WASM32
126+
+ WASM32,
127+
+ LINUX_PPC64LE
128+
).associateBy { it.name }
129+
}
130+
}

0 commit comments

Comments
 (0)