Skip to content

Commit f87abc3

Browse files
committed
Fix line-ends
With this change, all files have only Linux line-ends (no CRLF pairs). This should improve the situation of building OMR (and downstream projects like OpenJ9) on z/OS where more care is required so proper conversions to EBCDIC can occur. See also eclipse-openj9/openj9#1743. Signed-off-by: Keith W. Campbell <[email protected]>
1 parent 884959f commit f87abc3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+7936
-7948
lines changed

Notice.html

+108-109
Large diffs are not rendered by default.

about.html

+35-36
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2-
<html xmlns="http://www.w3.org/1999/xhtml"><head>
3-
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
4-
<title>About</title>
5-
</head>
6-
<body lang="EN-US">
7-
<h2>About This Content</h2>
8-
9-
<p><em>September 8, 2017</em></p>
10-
<h3>License</h3>
11-
12-
<p>This program and the accompanying materials are made available under the terms of the
13-
Eclipse Public License 2 which accompanies this distribution and is available at
14-
<a href="https://eclipse.org/legal/epl-2.0">https://eclipse.org/legal/epl-2.0</a> or the
15-
Apache License, Version 2.0 which accompanies this distribution and is available at
16-
<a href="https://www.apache.org/licenses/LICENSE-2.0">https://www.apache.org/licenses/LICENSE-2.0</a>.</p>
17-
18-
<p>This Source Code may also be made available under the following Secondary Licenses when
19-
the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are
20-
satisfied: GNU General Public License, version 2 with the GNU Classpath Exception [1] and
21-
GNU General Public License, version 2 with the OpenJDK Assembly Exception [2].</p>
22-
23-
<p>
24-
[1] <a href="https://www.gnu.org/software/classpath/license.html">https://www.gnu.org/software/classpath/license.html</a><br>
25-
[2] <a href="http://openjdk.java.net/legal/assembly-exception.html">http://openjdk.java.net/legal/assembly-exception.html</a><br><br>
26-
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
27-
</p>
28-
29-
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by
30-
another party ("Redistributor") and different terms and conditions may apply to your use of any object code in
31-
the Content. Check the Redistributor's license that was provided with the Content. If no such license exists,
32-
contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL and Apache
33-
License 2.0 still apply to any source code in the Content and such source code may be obtained at
34-
<a href="https://www.eclipse.org/">https://www.eclipse.org</a>.</p>
35-
</body></html>
36-
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<html xmlns="http://www.w3.org/1999/xhtml"><head>
3+
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
4+
<title>About</title>
5+
</head>
6+
<body lang="EN-US">
7+
<h2>About This Content</h2>
8+
9+
<p><em>September 8, 2017</em></p>
10+
<h3>License</h3>
11+
12+
<p>This program and the accompanying materials are made available under the terms of the
13+
Eclipse Public License 2 which accompanies this distribution and is available at
14+
<a href="https://eclipse.org/legal/epl-2.0">https://eclipse.org/legal/epl-2.0</a> or the
15+
Apache License, Version 2.0 which accompanies this distribution and is available at
16+
<a href="https://www.apache.org/licenses/LICENSE-2.0">https://www.apache.org/licenses/LICENSE-2.0</a>.</p>
17+
18+
<p>This Source Code may also be made available under the following Secondary Licenses when
19+
the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are
20+
satisfied: GNU General Public License, version 2 with the GNU Classpath Exception [1] and
21+
GNU General Public License, version 2 with the OpenJDK Assembly Exception [2].</p>
22+
23+
<p>
24+
[1] <a href="https://www.gnu.org/software/classpath/license.html">https://www.gnu.org/software/classpath/license.html</a><br>
25+
[2] <a href="http://openjdk.java.net/legal/assembly-exception.html">http://openjdk.java.net/legal/assembly-exception.html</a><br><br>
26+
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
27+
</p>
28+
29+
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by
30+
another party ("Redistributor") and different terms and conditions may apply to your use of any object code in
31+
the Content. Check the Redistributor's license that was provided with the Content. If no such license exists,
32+
contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL and Apache
33+
License 2.0 still apply to any source code in the Content and such source code may be obtained at
34+
<a href="https://www.eclipse.org/">https://www.eclipse.org</a>.</p>
35+
</body></html>

asl-v20.text

+200-200
Large diffs are not rendered by default.

cmake/modules/platform/arch/ppc.cmake

+30-30
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
###############################################################################
2-
# Copyright (c) 2017, 2017 IBM Corp. and others
3-
#
4-
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License 2.0 which accompanies this
6-
# distribution and is available at http://eclipse.org/legal/epl-2.0
7-
# or the Apache License, Version 2.0 which accompanies this distribution
8-
# and is available at https://www.apache.org/licenses/LICENSE-2.0.
9-
#
10-
# This Source Code may also be made available under the following Secondary
11-
# Licenses when the conditions for such availability set forth in the
12-
# Eclipse Public License, v. 2.0 are satisfied: GNU General Public License,
13-
# version 2 with the GNU Classpath Exception [1] and GNU General Public
14-
# License, version 2 with the OpenJDK Assembly Exception [2].
15-
#
16-
# [1] https://www.gnu.org/software/classpath/license.html
17-
# [2] http://openjdk.java.net/legal/assembly-exception.html
18-
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20-
###############################################################################
21-
22-
if(OMR_ENV_DATA64)
23-
list(APPEND OMR_PLATFORM_DEFINITIONS
24-
-DPPC64
25-
)
26-
endif()
27-
28-
list(APPEND OMR_PLATFORM_DEFINITIONS
29-
-DPPC
30-
)
1+
###############################################################################
2+
# Copyright (c) 2017, 2018 IBM Corp. and others
3+
#
4+
# This program and the accompanying materials are made available under
5+
# the terms of the Eclipse Public License 2.0 which accompanies this
6+
# distribution and is available at http://eclipse.org/legal/epl-2.0
7+
# or the Apache License, Version 2.0 which accompanies this distribution
8+
# and is available at https://www.apache.org/licenses/LICENSE-2.0.
9+
#
10+
# This Source Code may also be made available under the following Secondary
11+
# Licenses when the conditions for such availability set forth in the
12+
# Eclipse Public License, v. 2.0 are satisfied: GNU General Public License,
13+
# version 2 with the GNU Classpath Exception [1] and GNU General Public
14+
# License, version 2 with the OpenJDK Assembly Exception [2].
15+
#
16+
# [1] https://www.gnu.org/software/classpath/license.html
17+
# [2] http://openjdk.java.net/legal/assembly-exception.html
18+
#
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
###############################################################################
21+
22+
if(OMR_ENV_DATA64)
23+
list(APPEND OMR_PLATFORM_DEFINITIONS
24+
-DPPC64
25+
)
26+
endif()
27+
28+
list(APPEND OMR_PLATFORM_DEFINITIONS
29+
-DPPC
30+
)
3131

3232
# Testarossa build variables. Longer term the distinction between TR and the rest
3333
# of the OMR code should be heavily reduced. In the mean time, we keep
+36-36
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
###############################################################################
2-
# Copyright (c) 2017, 2017 IBM Corp. and others
3-
#
4-
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License 2.0 which accompanies this
6-
# distribution and is available at http://eclipse.org/legal/epl-2.0
7-
# or the Apache License, Version 2.0 which accompanies this distribution
8-
# and is available at https://www.apache.org/licenses/LICENSE-2.0.
9-
#
10-
# This Source Code may also be made available under the following Secondary
11-
# Licenses when the conditions for such availability set forth in the
12-
# Eclipse Public License, v. 2.0 are satisfied: GNU General Public License,
13-
# version 2 with the GNU Classpath Exception [1] and GNU General Public
14-
# License, version 2 with the OpenJDK Assembly Exception [2].
15-
#
16-
# [1] https://www.gnu.org/software/classpath/license.html
17-
# [2] http://openjdk.java.net/legal/assembly-exception.html
18-
#
19-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20-
###############################################################################
21-
22-
list(APPEND OMR_PLATFORM_DEFINITIONS
23-
-DJ9VM_TIERED_CODE_CACHE
24-
)
25-
26-
# Testarossa build variables. Longer term the distinction between TR and the rest
27-
# of the OMR code should be heavily reduced. In the mean time, we keep
28-
# the distinction
29-
set(TR_HOST_ARCH z)
30-
set(TR_HOST_BITS 64)
31-
list(APPEND TR_COMPILE_DEFINITIONS TR_HOST_S390 TR_TARGET_S390)
32-
33-
if(OMR_ENV_DATA64)
34-
list(APPEND TR_COMPILE_DEFINITIONS TR_HOST_64BIT TR_TARGET_64BIT)
35-
endif()
36-
set(CMAKE_ASM-ATT_FLAGS "-noexecstack -march=z9-109")
1+
###############################################################################
2+
# Copyright (c) 2017, 2018 IBM Corp. and others
3+
#
4+
# This program and the accompanying materials are made available under
5+
# the terms of the Eclipse Public License 2.0 which accompanies this
6+
# distribution and is available at http://eclipse.org/legal/epl-2.0
7+
# or the Apache License, Version 2.0 which accompanies this distribution
8+
# and is available at https://www.apache.org/licenses/LICENSE-2.0.
9+
#
10+
# This Source Code may also be made available under the following Secondary
11+
# Licenses when the conditions for such availability set forth in the
12+
# Eclipse Public License, v. 2.0 are satisfied: GNU General Public License,
13+
# version 2 with the GNU Classpath Exception [1] and GNU General Public
14+
# License, version 2 with the OpenJDK Assembly Exception [2].
15+
#
16+
# [1] https://www.gnu.org/software/classpath/license.html
17+
# [2] http://openjdk.java.net/legal/assembly-exception.html
18+
#
19+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
20+
###############################################################################
21+
22+
list(APPEND OMR_PLATFORM_DEFINITIONS
23+
-DJ9VM_TIERED_CODE_CACHE
24+
)
25+
26+
# Testarossa build variables. Longer term the distinction between TR and the rest
27+
# of the OMR code should be heavily reduced. In the mean time, we keep
28+
# the distinction
29+
set(TR_HOST_ARCH z)
30+
set(TR_HOST_BITS 64)
31+
list(APPEND TR_COMPILE_DEFINITIONS TR_HOST_S390 TR_TARGET_S390)
32+
33+
if(OMR_ENV_DATA64)
34+
list(APPEND TR_COMPILE_DEFINITIONS TR_HOST_64BIT TR_TARGET_64BIT)
35+
endif()
36+
set(CMAKE_ASM-ATT_FLAGS "-noexecstack -march=z9-109")

compiler/CMakeLists.txt

+56-56
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
1-
###############################################################################
2-
# Copyright (c) 2018, 2018 IBM Corp. and others
3-
#
4-
# This program and the accompanying materials are made available under
5-
# the terms of the Eclipse Public License 2.0 which accompanies this
6-
# distribution and is available at https://www.eclipse.org/legal/epl-2.0/
7-
# or the Apache License, Version 2.0 which accompanies this distribution and
8-
# is available at https://www.apache.org/licenses/LICENSE-2.0.
9-
#
10-
# This Source Code may also be made available under the following
11-
# Secondary Licenses when the conditions for such availability set
12-
# forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
13-
# General Public License, version 2 with the GNU Classpath
14-
# Exception [1] and GNU General Public License, version 2 with the
15-
# OpenJDK Assembly Exception [2].
16-
#
17-
# [1] https://www.gnu.org/software/classpath/license.html
18-
# [2] http://openjdk.java.net/legal/assembly-exception.html
19-
#
20-
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
21-
###############################################################################
22-
23-
include(OmrCompilerSupport)
24-
25-
# Add the contents of the macro to CORE_COMPILER_OBJECTS in this scope.
26-
# The library name parameter is currently ignored.
27-
macro(compiler_library libraryname)
28-
list(APPEND CORE_COMPILER_OBJECTS ${ARGN})
29-
endmacro(compiler_library)
30-
31-
# Instead of a real add_subdirectory we just include the file so everything stays
32-
# in the same scope.
33-
macro(add_compiler_subdirectory dir)
34-
include("${omr_SOURCE_DIR}/compiler/${dir}/CMakeLists.txt")
35-
endmacro(add_compiler_subdirectory)
36-
37-
38-
# create an object list which is populated in the subdirectories
39-
set(CORE_COMPILER_OBJECTS "")
40-
41-
add_compiler_subdirectory(codegen)
42-
add_compiler_subdirectory(compile)
43-
add_compiler_subdirectory(control)
44-
add_compiler_subdirectory(env)
45-
add_compiler_subdirectory(il)
46-
add_compiler_subdirectory(ilgen)
47-
add_compiler_subdirectory(infra)
48-
add_compiler_subdirectory(optimizer)
49-
add_compiler_subdirectory(ras)
50-
add_compiler_subdirectory(runtime)
51-
52-
add_compiler_subdirectory(${TR_TARGET_ARCH})
53-
54-
# Promote the list variable into a global property.
55-
# That way we dont need to worry about scoping issues.
56-
set_property(GLOBAL PROPERTY OMR_CORE_COMPILER_OBJECTS ${CORE_COMPILER_OBJECTS})
1+
###############################################################################
2+
# Copyright (c) 2018, 2018 IBM Corp. and others
3+
#
4+
# This program and the accompanying materials are made available under
5+
# the terms of the Eclipse Public License 2.0 which accompanies this
6+
# distribution and is available at https://www.eclipse.org/legal/epl-2.0/
7+
# or the Apache License, Version 2.0 which accompanies this distribution and
8+
# is available at https://www.apache.org/licenses/LICENSE-2.0.
9+
#
10+
# This Source Code may also be made available under the following
11+
# Secondary Licenses when the conditions for such availability set
12+
# forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
13+
# General Public License, version 2 with the GNU Classpath
14+
# Exception [1] and GNU General Public License, version 2 with the
15+
# OpenJDK Assembly Exception [2].
16+
#
17+
# [1] https://www.gnu.org/software/classpath/license.html
18+
# [2] http://openjdk.java.net/legal/assembly-exception.html
19+
#
20+
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
21+
###############################################################################
22+
23+
include(OmrCompilerSupport)
24+
25+
# Add the contents of the macro to CORE_COMPILER_OBJECTS in this scope.
26+
# The library name parameter is currently ignored.
27+
macro(compiler_library libraryname)
28+
list(APPEND CORE_COMPILER_OBJECTS ${ARGN})
29+
endmacro(compiler_library)
30+
31+
# Instead of a real add_subdirectory we just include the file so everything stays
32+
# in the same scope.
33+
macro(add_compiler_subdirectory dir)
34+
include("${omr_SOURCE_DIR}/compiler/${dir}/CMakeLists.txt")
35+
endmacro(add_compiler_subdirectory)
36+
37+
38+
# create an object list which is populated in the subdirectories
39+
set(CORE_COMPILER_OBJECTS "")
40+
41+
add_compiler_subdirectory(codegen)
42+
add_compiler_subdirectory(compile)
43+
add_compiler_subdirectory(control)
44+
add_compiler_subdirectory(env)
45+
add_compiler_subdirectory(il)
46+
add_compiler_subdirectory(ilgen)
47+
add_compiler_subdirectory(infra)
48+
add_compiler_subdirectory(optimizer)
49+
add_compiler_subdirectory(ras)
50+
add_compiler_subdirectory(runtime)
51+
52+
add_compiler_subdirectory(${TR_TARGET_ARCH})
53+
54+
# Promote the list variable into a global property.
55+
# That way we dont need to worry about scoping issues.
56+
set_property(GLOBAL PROPERTY OMR_CORE_COMPILER_OBJECTS ${CORE_COMPILER_OBJECTS})

0 commit comments

Comments
 (0)