diff --git a/buildspecs/aix_ppc-64.spec b/buildspecs/aix_ppc-64.spec index 2966c8d8110..f0180259207 100644 --- a/buildspecs/aix_ppc-64.spec +++ b/buildspecs/aix_ppc-64.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> AIX64 AIX64 diff --git a/buildspecs/aix_ppc-64_cmprssptrs.spec b/buildspecs/aix_ppc-64_cmprssptrs.spec index e08ed26aa24..e49334d3728 100644 --- a/buildspecs/aix_ppc-64_cmprssptrs.spec +++ b/buildspecs/aix_ppc-64_cmprssptrs.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> AIX64 Compressed Pointers AIX64 diff --git a/buildspecs/aix_ppc-64_codecov.spec b/buildspecs/aix_ppc-64_codecov.spec index 4703eeaed71..ffd7aa3e3fa 100644 --- a/buildspecs/aix_ppc-64_codecov.spec +++ b/buildspecs/aix_ppc-64_codecov.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> AIX64 CodeCov AIX64 diff --git a/buildspecs/aix_ppc.spec b/buildspecs/aix_ppc.spec index af5ec20a8d9..2c3b484c3e0 100644 --- a/buildspecs/aix_ppc.spec +++ b/buildspecs/aix_ppc.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> AIX RS6000 diff --git a/buildspecs/linux_390-64.spec b/buildspecs/linux_390-64.spec index 432772fade8..054537baf4f 100644 --- a/buildspecs/linux_390-64.spec +++ b/buildspecs/linux_390-64.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux S390 64bit LinuxS390 diff --git a/buildspecs/linux_390-64_cmprssptrs.spec b/buildspecs/linux_390-64_cmprssptrs.spec index f98b2f09a28..14deed1d1ba 100644 --- a/buildspecs/linux_390-64_cmprssptrs.spec +++ b/buildspecs/linux_390-64_cmprssptrs.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux S390 64bit Compressed Pointers LinuxS390 diff --git a/buildspecs/linux_390-64_cmprssptrs_codecov.spec b/buildspecs/linux_390-64_cmprssptrs_codecov.spec index 1ee7160c717..f812b9662aa 100644 --- a/buildspecs/linux_390-64_cmprssptrs_codecov.spec +++ b/buildspecs/linux_390-64_cmprssptrs_codecov.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux S390 64bit Compressed Pointers CodeCov LinuxS390 diff --git a/buildspecs/linux_390-64_codecov.spec b/buildspecs/linux_390-64_codecov.spec index 91f0a528300..7c4e6c622fa 100644 --- a/buildspecs/linux_390-64_codecov.spec +++ b/buildspecs/linux_390-64_codecov.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux S390 64bit CodeCov LinuxS390 diff --git a/buildspecs/linux_390.spec b/buildspecs/linux_390.spec index cedad194122..6afcc9d7699 100644 --- a/buildspecs/linux_390.spec +++ b/buildspecs/linux_390.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux S390 LinuxS390 diff --git a/buildspecs/linux_arm.spec b/buildspecs/linux_arm.spec index 8ba0890408b..e8d7b350429 100644 --- a/buildspecs/linux_arm.spec +++ b/buildspecs/linux_arm.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux ARM ARMGNUEABI diff --git a/buildspecs/linux_arm_linaro.spec b/buildspecs/linux_arm_linaro.spec index be37b66e6f9..fc06a835bed 100644 --- a/buildspecs/linux_arm_linaro.spec +++ b/buildspecs/linux_arm_linaro.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux ARM ARMGNUEABI diff --git a/buildspecs/linux_ppc-64.spec b/buildspecs/linux_ppc-64.spec index 585b7df8bdd..e4f8faf9802 100644 --- a/buildspecs/linux_ppc-64.spec +++ b/buildspecs/linux_ppc-64.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux PPC 64bit LinuxPPC64 diff --git a/buildspecs/linux_ppc-64_cmprssptrs.spec b/buildspecs/linux_ppc-64_cmprssptrs.spec index 6b399178097..6b7e7649551 100644 --- a/buildspecs/linux_ppc-64_cmprssptrs.spec +++ b/buildspecs/linux_ppc-64_cmprssptrs.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux PPC 64bit Compressed Pointers LinuxPPC64 diff --git a/buildspecs/linux_ppc-64_cmprssptrs_le.spec b/buildspecs/linux_ppc-64_cmprssptrs_le.spec index 86cda8c8d37..a02ea791b0a 100644 --- a/buildspecs/linux_ppc-64_cmprssptrs_le.spec +++ b/buildspecs/linux_ppc-64_cmprssptrs_le.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux PPC LE 64bit Compressed Pointers LinuxPPC64LE diff --git a/buildspecs/linux_ppc-64_cmprssptrs_le_gcc.spec b/buildspecs/linux_ppc-64_cmprssptrs_le_gcc.spec index 6b4211a19a1..f0e7abbedc6 100644 --- a/buildspecs/linux_ppc-64_cmprssptrs_le_gcc.spec +++ b/buildspecs/linux_ppc-64_cmprssptrs_le_gcc.spec @@ -20,7 +20,6 @@ OpenJDK Assembly Exception [2]. 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 --> - Linux PPC LE 64bit GCC Compressed Pointers LinuxPPC64LE diff --git a/buildspecs/linux_ppc-64_cmprssptrs_le_valhalla_nestmates.spec b/buildspecs/linux_ppc-64_cmprssptrs_le_valhalla_nestmates.spec index 21bd858f5cb..6b90013172d 100644 --- a/buildspecs/linux_ppc-64_cmprssptrs_le_valhalla_nestmates.spec +++ b/buildspecs/linux_ppc-64_cmprssptrs_le_valhalla_nestmates.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux PPC LE 64bit Compressed Pointers Valhalla Nestmates LinuxPPC64LE diff --git a/buildspecs/linux_ppc-64_le.spec b/buildspecs/linux_ppc-64_le.spec index 01450692cc3..4aec82daae9 100644 --- a/buildspecs/linux_ppc-64_le.spec +++ b/buildspecs/linux_ppc-64_le.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux PPC LE 64bit LinuxPPC64LE diff --git a/buildspecs/linux_ppc-64_le_gcc.spec b/buildspecs/linux_ppc-64_le_gcc.spec index 03b2699450a..080185924b0 100644 --- a/buildspecs/linux_ppc-64_le_gcc.spec +++ b/buildspecs/linux_ppc-64_le_gcc.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux PPC LE 64bit GCC LinuxPPC64LE diff --git a/buildspecs/linux_ppc.spec b/buildspecs/linux_ppc.spec index bebf1ea2f6e..8d5e0656a9c 100644 --- a/buildspecs/linux_ppc.spec +++ b/buildspecs/linux_ppc.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux PPC LinuxPPC diff --git a/buildspecs/linux_x86-64.spec b/buildspecs/linux_x86-64.spec index ab3fd657ea0..46d8b826425 100644 --- a/buildspecs/linux_x86-64.spec +++ b/buildspecs/linux_x86-64.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux Hammer LinuxHammer diff --git a/buildspecs/linux_x86-64_cmprssptrs.spec b/buildspecs/linux_x86-64_cmprssptrs.spec index 9ffddd14839..0006416fa49 100644 --- a/buildspecs/linux_x86-64_cmprssptrs.spec +++ b/buildspecs/linux_x86-64_cmprssptrs.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux Hammer Compressed Pointers LinuxHammer diff --git a/buildspecs/linux_x86-64_cmprssptrs_cs.spec b/buildspecs/linux_x86-64_cmprssptrs_cs.spec index 0f71cc60565..02322e56fc7 100644 --- a/buildspecs/linux_x86-64_cmprssptrs_cs.spec +++ b/buildspecs/linux_x86-64_cmprssptrs_cs.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux Hammer Compressed Pointers Concurrent Scavenger LinuxHammer diff --git a/buildspecs/linux_x86-64_cmprssptrs_panama.spec b/buildspecs/linux_x86-64_cmprssptrs_panama.spec index d7883b36ef8..5da1205d20c 100644 --- a/buildspecs/linux_x86-64_cmprssptrs_panama.spec +++ b/buildspecs/linux_x86-64_cmprssptrs_panama.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux Hammer Compressed Pointers Panama LinuxHammer diff --git a/buildspecs/linux_x86-64_codecov.spec b/buildspecs/linux_x86-64_codecov.spec index 78904211a8b..d074c586369 100644 --- a/buildspecs/linux_x86-64_codecov.spec +++ b/buildspecs/linux_x86-64_codecov.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux Hammer CodeCov LinuxHammer diff --git a/buildspecs/linux_x86.spec b/buildspecs/linux_x86.spec index f219007bb91..8bbc498452e 100644 --- a/buildspecs/linux_x86.spec +++ b/buildspecs/linux_x86.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux IA32 Linux386PIC diff --git a/buildspecs/linux_x86_codecov.spec b/buildspecs/linux_x86_codecov.spec index db22b461842..97d643e8cf0 100644 --- a/buildspecs/linux_x86_codecov.spec +++ b/buildspecs/linux_x86_codecov.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Linux IA32 CodeCov Linux386PIC diff --git a/buildspecs/linux_ztpf_390-64.spec b/buildspecs/linux_ztpf_390-64.spec index 91bc9f60b01..aaab21590ad 100644 --- a/buildspecs/linux_ztpf_390-64.spec +++ b/buildspecs/linux_ztpf_390-64.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> ZTPF S390 64bit Builder LinuxS390 diff --git a/buildspecs/linux_ztpf_390-64_cmprssptrs.spec b/buildspecs/linux_ztpf_390-64_cmprssptrs.spec index 5fe36a2e70f..e188814555b 100644 --- a/buildspecs/linux_ztpf_390-64_cmprssptrs.spec +++ b/buildspecs/linux_ztpf_390-64_cmprssptrs.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> ZTPF S390 64bit Compressed Pointers Builder LinuxS390 diff --git a/buildspecs/osx_x86-64.spec b/buildspecs/osx_x86-64.spec index fe8bf52235e..0efc331f1d0 100644 --- a/buildspecs/osx_x86-64.spec +++ b/buildspecs/osx_x86-64.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> OSX OSX diff --git a/buildspecs/win_x86-64.spec b/buildspecs/win_x86-64.spec index c2b0becaebf..db517b8b1e2 100644 --- a/buildspecs/win_x86-64.spec +++ b/buildspecs/win_x86-64.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Win64 Hammer WinHammer diff --git a/buildspecs/win_x86-64_cmprssptrs.spec b/buildspecs/win_x86-64_cmprssptrs.spec index bd8f727fa23..067bfca6ac5 100644 --- a/buildspecs/win_x86-64_cmprssptrs.spec +++ b/buildspecs/win_x86-64_cmprssptrs.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Win64 Hammer Compressed Pointers WinHammer diff --git a/buildspecs/win_x86.spec b/buildspecs/win_x86.spec index 9c7c8e717c9..940093319d0 100644 --- a/buildspecs/win_x86.spec +++ b/buildspecs/win_x86.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> Windows IA32 WIN31 diff --git a/buildspecs/zos_390-64.spec b/buildspecs/zos_390-64.spec index 9f6debfb1f3..3b74082695b 100644 --- a/buildspecs/zos_390-64.spec +++ b/buildspecs/zos_390-64.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> zOS S390 64bit ZOS390 diff --git a/buildspecs/zos_390-64_cmprssptrs.spec b/buildspecs/zos_390-64_cmprssptrs.spec index 740e5f7a43c..a7c1d1e3d35 100644 --- a/buildspecs/zos_390-64_cmprssptrs.spec +++ b/buildspecs/zos_390-64_cmprssptrs.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> zOS S390 64bit Compressed Pointers ZOS390 diff --git a/buildspecs/zos_390.spec b/buildspecs/zos_390.spec index 0541c08c129..649027f2448 100644 --- a/buildspecs/zos_390.spec +++ b/buildspecs/zos_390.spec @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> zOS S390 ZOS390 diff --git a/runtime/bcutil/test/dyntest/module.xml b/runtime/bcutil/test/dyntest/module.xml index 5ef69daaf86..4eb533b777d 100644 --- a/runtime/bcutil/test/dyntest/module.xml +++ b/runtime/bcutil/test/dyntest/module.xml @@ -1,27 +1,26 @@ - @@ -51,7 +50,7 @@ - + diff --git a/runtime/bcutil/test/natives/module.xml b/runtime/bcutil/test/natives/module.xml index 0c77dedca84..107c2f7bf17 100644 --- a/runtime/bcutil/test/natives/module.xml +++ b/runtime/bcutil/test/natives/module.xml @@ -1,27 +1,26 @@ - @@ -39,7 +38,7 @@ - + diff --git a/runtime/cfdumper/module.xml b/runtime/cfdumper/module.xml index 58edb792e7c..5e62ce43082 100644 --- a/runtime/cfdumper/module.xml +++ b/runtime/cfdumper/module.xml @@ -1,27 +1,26 @@ - @@ -36,7 +35,7 @@ - + @@ -62,7 +61,7 @@ - + diff --git a/runtime/gc_glue_java/configure_includes/configure_aix_ppc.mk b/runtime/gc_glue_java/configure_includes/configure_aix_ppc.mk index a63f6c9033e..aa0f943ded0 100644 --- a/runtime/gc_glue_java/configure_includes/configure_aix_ppc.mk +++ b/runtime/gc_glue_java/configure_includes/configure_aix_ppc.mk @@ -97,10 +97,10 @@ endif CONFIGURE_ARGS += libprefix=lib exeext= solibext=.so arlibext=.a objext=.o ifeq (default,$(origin CC)) - CC=xlC_r + CC = xlC_r endif ifeq (default,$(origin CXX)) - CXX=$(CC) + CXX = $(CC) endif CONFIGURE_ARGS += 'AS=$(AS)' diff --git a/runtime/gc_glue_java/configure_includes/configure_linux_390.mk b/runtime/gc_glue_java/configure_includes/configure_linux_390.mk index 3cbcb44208f..dd755671de4 100644 --- a/runtime/gc_glue_java/configure_includes/configure_linux_390.mk +++ b/runtime/gc_glue_java/configure_includes/configure_linux_390.mk @@ -110,10 +110,10 @@ endif CONFIGURE_ARGS += libprefix=lib exeext= solibext=.so arlibext=.a objext=.o ifeq (default,$(origin CC)) - CC=gcc + CC = gcc endif ifeq (default,$(origin CXX)) - CXX=g++ + CXX = g++ endif CONFIGURE_ARGS += 'AR=$(AR)' diff --git a/runtime/gc_glue_java/configure_includes/configure_linux_arm.mk b/runtime/gc_glue_java/configure_includes/configure_linux_arm.mk index 8e6b7439d97..10f675a1eab 100644 --- a/runtime/gc_glue_java/configure_includes/configure_linux_arm.mk +++ b/runtime/gc_glue_java/configure_includes/configure_linux_arm.mk @@ -41,16 +41,16 @@ ifneq (,$(findstring linux_arm, $(SPEC))) endif ifeq (default,$(origin AS)) - AS=$(OPENJ9_CC_PREFIX)-as + AS = $(OPENJ9_CC_PREFIX)-as endif ifeq (default,$(origin CC)) - CC=$(OPENJ9_CC_PREFIX)-gcc + CC = $(OPENJ9_CC_PREFIX)-gcc endif ifeq (default,$(origin CXX)) - CXX=$(OPENJ9_CC_PREFIX)-g++ + CXX = $(OPENJ9_CC_PREFIX)-g++ endif ifeq (default,$(origin AR)) - AR=$(OPENJ9_CC_PREFIX)-ar + AR = $(OPENJ9_CC_PREFIX)-ar endif CONFIGURE_ARGS += 'AS=$(AS)' diff --git a/runtime/gc_glue_java/configure_includes/configure_linux_ppc.mk b/runtime/gc_glue_java/configure_includes/configure_linux_ppc.mk index f0897887baf..ed596f61201 100644 --- a/runtime/gc_glue_java/configure_includes/configure_linux_ppc.mk +++ b/runtime/gc_glue_java/configure_includes/configure_linux_ppc.mk @@ -167,10 +167,10 @@ CONFIGURE_ARGS += libprefix=lib exeext= solibext=.so arlibext=.a objext=.o # All specs buildspecs named "_gcc" use gcc, others currently use XLC. ifneq (,$(findstring _gcc,$(SPEC))) ifeq (default,$(origin CC)) - CC=gcc + CC = gcc endif ifeq (default,$(origin CXX)) - CXX=g++ + CXX = g++ endif CONFIGURE_ARGS += 'OMR_TOOLCHAIN=gcc' CONFIGURE_ARGS += 'CCLINKEXE=$(CC)' @@ -178,13 +178,13 @@ ifneq (,$(findstring _gcc,$(SPEC))) CONFIGURE_ARGS += 'CXXLINKSHARED=$(CXX)' else ifeq (default,$(origin AS)) - AS=xlC_r + AS = xlC_r endif ifeq (default,$(origin CC)) - CC=xlC_r + CC = xlC_r endif ifeq (default,$(origin CXX)) - CXX=xlC_r + CXX = xlC_r endif CONFIGURE_ARGS += 'OMR_TOOLCHAIN=xlc' CONFIGURE_ARGS += 'CCLINKEXE=xlc_r' diff --git a/runtime/gcchk/module.xml b/runtime/gcchk/module.xml index ef2fec41150..3ae18f26ac8 100644 --- a/runtime/gcchk/module.xml +++ b/runtime/gcchk/module.xml @@ -1,27 +1,25 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 +--> @@ -86,4 +84,4 @@ - \ No newline at end of file + diff --git a/runtime/gdb_plugin/module.xml b/runtime/gdb_plugin/module.xml index 183541939ab..865bbdfc1ab 100644 --- a/runtime/gdb_plugin/module.xml +++ b/runtime/gdb_plugin/module.xml @@ -1,36 +1,32 @@ - +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. - +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. + +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html +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 +--> + - @@ -77,7 +73,7 @@ - + diff --git a/runtime/jextractnatives/module.xml b/runtime/jextractnatives/module.xml index ae3f90ae142..4496d08931c 100644 --- a/runtime/jextractnatives/module.xml +++ b/runtime/jextractnatives/module.xml @@ -1,24 +1,24 @@ @@ -54,4 +54,3 @@ - diff --git a/runtime/jilgen/module.xml b/runtime/jilgen/module.xml index 7b0fb2ca50f..4d78f0008b2 100644 --- a/runtime/jilgen/module.xml +++ b/runtime/jilgen/module.xml @@ -1,27 +1,26 @@ - - - + core j2se diff --git a/runtime/makelib/targets.mk.aix.inc.ftl b/runtime/makelib/targets.mk.aix.inc.ftl index 97ee1460cb0..73c38266894 100644 --- a/runtime/makelib/targets.mk.aix.inc.ftl +++ b/runtime/makelib/targets.mk.aix.inc.ftl @@ -1,120 +1,120 @@ -<#-- - Copyright (c) 1998, 2017 IBM Corp. and others - - This program and the accompanying materials are made available under - the terms of the Eclipse Public License 2.0 which accompanies this - distribution and is available at https://www.eclipse.org/legal/epl-2.0/ - or the Apache License, Version 2.0 which accompanies this distribution and - is available at https://www.apache.org/licenses/LICENSE-2.0. - - This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set - forth in the Eclipse Public License, v. 2.0 are satisfied: GNU - General Public License, version 2 with the GNU Classpath - Exception [1] and GNU General Public License, version 2 with the - OpenJDK Assembly Exception [2]. - - [1] https://www.gnu.org/software/classpath/license.html - [2] http://openjdk.java.net/legal/assembly-exception.html - - 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 +<#-- +Copyright (c) 1998, 2018 IBM Corp. and others + +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. + +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 --> <#assign lib_target_rule> -$(UMA_LIBTARGET): $(UMA_OBJECTS) +$(UMA_LIBTARGET) : $(UMA_OBJECTS) $(AR) $(UMA_LIB_LINKER_FLAGS) rcv $(UMA_LIBTARGET) $(UMA_OBJECTS) $(RANLIB) $(UMA_LIBTARGET) <#assign dll_target_rule> -$(UMA_DLLTARGET): $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) +$(UMA_DLLTARGET) : $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) -rm -f $(UMA_DLLTARGET) $(UMA_DLL_LD) $(UMA_DLL_LINK_FLAGS) \ - $(VMLINK) $(UMA_LINK_PATH) -o $(UMA_DLLTARGET)\ - $(UMA_OBJECTS) \ - $(UMA_DLL_LINK_POSTFLAGS) + $(VMLINK) $(UMA_LINK_PATH) -o $(UMA_DLLTARGET)\ + $(UMA_OBJECTS) \ + $(UMA_DLL_LINK_POSTFLAGS) <#assign exe_target_rule> -$(UMA_EXETARGET): $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) +$(UMA_EXETARGET) : $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) $(UMA_EXE_LD) $(UMA_CC_MODE) -brtl $(UMA_LINK_PATH) $(VMLINK) \ - $(UMA_OBJECTS) \ - $(UMA_LINK_LIBRARIES) \ - -o $@ -lm -lpthread -liconv -ldl + $(UMA_OBJECTS) \ + $(UMA_LINK_LIBRARIES) \ + -o $@ -lm -lpthread -liconv -ldl ifeq ($(j9vm_env_data64),1) - UMA_ASPP_DEBUG+=-g - UMA_LIB_LINKER_FLAGS+=-X64 - UMA_CC_MODE+=-q64 + UMA_ASPP_DEBUG += -g + UMA_LIB_LINKER_FLAGS += -X64 + UMA_CC_MODE += -q64 else - UMA_ASPP_DEBUG+=$(VMASMDEBUG) - UMA_LIB_LINKER_FLAGS+=-X32 - UMA_CC_MODE+=-q32 + UMA_ASPP_DEBUG += $(VMASMDEBUG) + UMA_LIB_LINKER_FLAGS += -X32 + UMA_CC_MODE += -q32 endif ifeq ($(j9vm_env_data64),1) - ASFLAGS+=-a64 -many + ASFLAGS += -a64 -many else - ASFLAGS+=-a32 -mppc + ASFLAGS += -a32 -mppc endif -ASFLAGS+=-o $@ - +ASFLAGS += -o $@ + ifdef UMA_DO_NOT_OPTIMIZE_CCODE -CFLAGS+=-O0 -CXXFLAGS+=-O0 + CFLAGS += -O0 + CXXFLAGS += -O0 else -CFLAGS+=-O3 -CXXFLAGS+=-O3 + CFLAGS += -O3 + CXXFLAGS += -O3 endif ifdef j9vm_uma_supportsIpv6 - CFLAGS+=-DIPv6_FUNCTION_SUPPORT - CXXFLAGS+=-DIPv6_FUNCTION_SUPPORT - CPPFLAGS+=-DIPv6_FUNCTION_SUPPORT + CFLAGS += -DIPv6_FUNCTION_SUPPORT + CXXFLAGS += -DIPv6_FUNCTION_SUPPORT + CPPFLAGS += -DIPv6_FUNCTION_SUPPORT endif - + ifdef I5_VERSION -CFLAGS+=$(UMA_CC_MODE) -else -CFLAGS+=-s $(UMA_CC_MODE) + CFLAGS += $(UMA_CC_MODE) +else + CFLAGS += -s $(UMA_CC_MODE) endif -CFLAGS+=-q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi -qxflag=LTOL:LTOL0 -qsuppress=1506-1108 -CFLAGS+=-D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -DRS6000 -DAIXPPC -D_LARGE_FILES +CFLAGS += -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi -qxflag=LTOL:LTOL0 -qsuppress=1506-1108 +CFLAGS += -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -DRS6000 -DAIXPPC -D_LARGE_FILES ifdef I5_VERSION -CXXFLAGS+=$(UMA_CC_MODE) + CXXFLAGS += $(UMA_CC_MODE) else -CXXFLAGS+=-s $(UMA_CC_MODE) + CXXFLAGS += -s $(UMA_CC_MODE) endif -CXXFLAGS+=-q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi -qxflag=LTOL:LTOL0 -qsuppress=1506-1108 -CXXFLAGS+=-D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -DRS6000 -DAIXPPC -D_LARGE_FILES +CXXFLAGS += -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi -qxflag=LTOL:LTOL0 -qsuppress=1506-1108 +CXXFLAGS += -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -DRS6000 -DAIXPPC -D_LARGE_FILES -CPPFLAGS+=-D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -DRS6000 -DAIXPPC -D_LARGE_FILES +CPPFLAGS += -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -DRS6000 -DAIXPPC -D_LARGE_FILES ifeq ($(j9vm_env_data64),1) - CFLAGS+=-DPPC64 - CXXFLAGS+=-DPPC64 - CPPFLAGS+=-DPPC64 + CFLAGS += -DPPC64 + CXXFLAGS += -DPPC64 + CPPFLAGS += -DPPC64 endif ifdef I5_VERSION - I5_FLAGS+=-qtbtable=full -qlist -qsource - I5_DEFINES+=-DJ9OS_I5 -DJ9OS_$(I5_VERSION) -I$(UMA_PATH_TO_ROOT)/iseries + I5_FLAGS += -qtbtable=full -qlist -qsource + I5_DEFINES += -DJ9OS_I5 -DJ9OS_$(I5_VERSION) -I$(UMA_PATH_TO_ROOT)/iseries - UMA_ASPP_DEBUG+= - CFLAGS+=$(I5_FLAGS) $(I5_DEFINES) - CXXFLAGS+=$(I5_FLAGS) $(I5_DEFINES) - CPPFLAGS+=$(I5_DEFINES) + UMA_ASPP_DEBUG += + CFLAGS += $(I5_FLAGS) $(I5_DEFINES) + CXXFLAGS += $(I5_FLAGS) $(I5_DEFINES) + CPPFLAGS += $(I5_DEFINES) endif ifdef UMA_USING_LD_TO_LINK ifeq ($(j9vm_env_data64),1) - UMA_DLL_LINK_FLAGS+=-b64 + UMA_DLL_LINK_FLAGS += -b64 else - UMA_DLL_LINK_FLAGS+=-b32 + UMA_DLL_LINK_FLAGS += -b32 endif - UMA_DLL_LINK_FLAGS+=-G -bnoentry -bernotok - UMA_DLL_LINK_FLAGS+=-bmap:$(UMA_TARGET_NAME).map - UMA_DLL_LINK_FLAGS+=-bE:$(UMA_TARGET_NAME).exp - UMA_LINK_LIBRARIES+=-lc_r -lC_r -lm -lpthread + UMA_DLL_LINK_FLAGS += -G -bnoentry -bernotok + UMA_DLL_LINK_FLAGS += -bmap:$(UMA_TARGET_NAME).map + UMA_DLL_LINK_FLAGS += -bE:$(UMA_TARGET_NAME).exp + UMA_LINK_LIBRARIES += -lc_r -lC_r -lm -lpthread else ifeq ($(j9vm_env_data64),1) UMA_DLL_LINK_FLAGS+=-X64 @@ -126,16 +126,16 @@ else endif ifdef I5_VERSION - UMA_DLL_LINK_FLAGS+=-bI:$(UMA_PATH_TO_ROOT)/iseries/i5exports.exp + UMA_DLL_LINK_FLAGS += -bI:$(UMA_PATH_TO_ROOT)/iseries/i5exports.exp endif ifdef UMA_AIX_MSG_TEST - UMA_DLL_LINK_FLAGS+=-bI:dummy.exp -bexpall + UMA_DLL_LINK_FLAGS += -bI:dummy.exp -bexpall endif -UMA_DLL_LINK_POSTFLAGS+=$(UMA_LINK_LIBRARIES) +UMA_DLL_LINK_POSTFLAGS += $(UMA_LINK_LIBRARIES) -$(patsubst %.s,%.o,$(filter %.s,$(UMA_FILES_TO_PREPROCESS))): %$(UMA_DOT_O): %.s +$(patsubst %.s,%.o,$(filter %.s,$(UMA_FILES_TO_PREPROCESS))) : %$(UMA_DOT_O) : %.s cc -P $(CPPFLAGS) $*.s sed 's/\!/\#/g' $*.i > $*.spp aspp $(UMA_ASPP_DEBUG) $*.spp $*.dbg @@ -144,14 +144,14 @@ $(patsubst %.s,%.o,$(filter %.s,$(UMA_FILES_TO_PREPROCESS))): %$(UMA_DOT_O): %.s ifdef UMA_TREAT_WARNINGS_AS_ERRORS ifndef UMA_SUPPRESS_WARNINGS_AS_ERRORS -CFLAGS+=-qhalt=w -CXXFLAGS+=-qhalt=w + CFLAGS += -qhalt=w + CXXFLAGS += -qhalt=w endif endif ifdef UMA_ENABLE_ALL_WARNINGS -ifndef UMA_SUPPRESS_ALL_WARNINGS -CFLAGS+= -CXXFLAGS+= + ifndef UMA_SUPPRESS_ALL_WARNINGS + CFLAGS += + CXXFLAGS += + endif endif -endif \ No newline at end of file diff --git a/runtime/makelib/targets.mk.linux.inc.ftl b/runtime/makelib/targets.mk.linux.inc.ftl index 35306238293..66259e09144 100644 --- a/runtime/makelib/targets.mk.linux.inc.ftl +++ b/runtime/makelib/targets.mk.linux.inc.ftl @@ -1,23 +1,23 @@ -<#-- - Copyright (c) 1998, 2018 IBM Corp. and others - - This program and the accompanying materials are made available under - the terms of the Eclipse Public License 2.0 which accompanies this - distribution and is available at https://www.eclipse.org/legal/epl-2.0/ - or the Apache License, Version 2.0 which accompanies this distribution and - is available at https://www.apache.org/licenses/LICENSE-2.0. - - This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set - forth in the Eclipse Public License, v. 2.0 are satisfied: GNU - General Public License, version 2 with the GNU Classpath - Exception [1] and GNU General Public License, version 2 with the - OpenJDK Assembly Exception [2]. - - [1] https://www.gnu.org/software/classpath/license.html - [2] http://openjdk.java.net/legal/assembly-exception.html - - 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 +<#-- +Copyright (c) 1998, 2018 IBM Corp. and others + +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. + +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 --> <#if uma.spec.processor.arm> @@ -29,16 +29,16 @@ OBJCOPY := objcopy <#assign lib_target_rule> -$(UMA_LIBTARGET): $(UMA_OBJECTS) +$(UMA_LIBTARGET) : $(UMA_OBJECTS) $(AR) rcv $(UMA_LIBTARGET) $(UMA_OBJECTS) <#assign dll_target_rule> -$(UMA_DLLTARGET): $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) +$(UMA_DLLTARGET) : $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) $(UMA_DLL_LD) $(UMA_DLL_LINK_FLAGS) \ - $(VMLINK) $(UMA_LINK_PATH) -o $(UMA_DLLTARGET)\ - $(UMA_OBJECTS) \ - $(UMA_DLL_LINK_POSTFLAGS) + $(VMLINK) $(UMA_LINK_PATH) -o $(UMA_DLLTARGET) \ + $(UMA_OBJECTS) \ + $(UMA_DLL_LINK_POSTFLAGS) ifdef j9vm_uma_gnuDebugSymbols $(OBJCOPY) --only-keep-debug $(UMA_DLLTARGET) $(UMA_DLLTARGET).dbg $(OBJCOPY) --strip-debug $(UMA_DLLTARGET) @@ -47,110 +47,108 @@ endif <#assign exe_target_rule> -$(UMA_EXETARGET): $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) +$(UMA_EXETARGET) : $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) $(UMA_EXE_LD) $(UMA_EXE_PREFIX_FLAGS) $(UMA_LINK_PATH) $(VMLINK) \ - $(UMA_OBJECTS) \ - $(UMA_BEGIN_DASH_L) \ - $(UMA_LINK_STATIC_LIBRARIES) \ - $(UMA_END_DASH_L) \ - $(UMA_LINK_SHARED_LIBRARIES) \ - -o $@ $(UMA_EXE_POSTFIX_FLAGS) + $(UMA_OBJECTS) \ + $(UMA_BEGIN_DASH_L) \ + $(UMA_LINK_STATIC_LIBRARIES) \ + $(UMA_END_DASH_L) \ + $(UMA_LINK_SHARED_LIBRARIES) \ + -o $@ $(UMA_EXE_POSTFIX_FLAGS) - <#if uma.spec.processor.s390> -ifndef j9vm_env_data64 - J9M31=-m31 -endif -UMA_EXE_PREFIX_FLAGS+=$(J9M31) + ifndef j9vm_env_data64 + J9M31 = -m31 + endif + UMA_EXE_PREFIX_FLAGS += $(J9M31) <#if uma.spec.processor.ppc && !uma.spec.flags.env_gcc.enabled> -ifdef j9vm_env_data64 -UMA_EXE_PREFIX_FLAGS+=-q64 -endif + ifdef j9vm_env_data64 + UMA_EXE_PREFIX_FLAGS += -q64 + endif <#if uma.spec.processor.x86> - UMA_EXE_PREFIX_FLAGS+=-m32 + UMA_EXE_PREFIX_FLAGS += -m32 <#if uma.spec.processor.ppc> -UMA_BEGIN_DASH_L=-Wl,--start-group -UMA_END_DASH_L=-Wl,--end-group + UMA_BEGIN_DASH_L = -Wl,--start-group + UMA_END_DASH_L = -Wl,--end-group <#else> -UMA_BEGIN_DASH_L=-Xlinker --start-group -UMA_END_DASH_L=-Xlinker --end-group + UMA_BEGIN_DASH_L = -Xlinker --start-group + UMA_END_DASH_L = -Xlinker --end-group -UMA_EXE_POSTFIX_FLAGS+=-lm -lpthread -lc -lrt -ldl -lutil -Wl,-z,origin,-rpath,\$$ORIGIN,--disable-new-dtags,-rpath-link,$(UMA_PATH_TO_ROOT) - +UMA_EXE_POSTFIX_FLAGS += -lm -lpthread -lc -lrt -ldl -lutil -Wl,-z,origin,-rpath,\$$ORIGIN,--disable-new-dtags,-rpath-link,$(UMA_PATH_TO_ROOT) + <#if uma.spec.processor.amd64> -UMA_MASM2GAS_FLAGS+=--64 + UMA_MASM2GAS_FLAGS += --64 <#if uma.spec.properties.uma_crossCompilerPath.defined> # Put the tools on the path. -PATH:=${uma.spec.properties.uma_crossCompilerPath.value}:<#noparse>${PATH} -XCOMP_TOOLCHAIN_BASEDIR:=${uma.spec.properties.uma_crossCompilerPath.value}/../ + PATH := ${uma.spec.properties.uma_crossCompilerPath.value}:<#noparse>${PATH} + XCOMP_TOOLCHAIN_BASEDIR := ${uma.spec.properties.uma_crossCompilerPath.value}/../ ifndef UMA_DO_NOT_OPTIMIZE_CCODE -<#if uma.spec.properties.uma_optimization_cflags.defined> - UMA_OPTIMIZATION_CFLAGS+=${uma.spec.properties.uma_optimization_cflags.value} -<#else> - <#if uma.spec.processor.amd64> - UMA_OPTIMIZATION_CFLAGS+=-O3 -fno-strict-aliasing - <#elseif uma.spec.processor.x86> - UMA_OPTIMIZATION_CFLAGS+=-O3 -fno-strict-aliasing -march=pentium4 -mtune=prescott -mpreferred-stack-boundary=4 - <#elseif uma.spec.processor.arm> - UMA_OPTIMIZATION_CFLAGS+=-g -O3 -fno-strict-aliasing $(ARM_ARCH_FLAGS) -Wno-unused-but-set-variable - <#elseif uma.spec.processor.ppc> - UMA_OPTIMIZATION_CFLAGS+=-O3 - <#if uma.spec.flags.env_littleEndian.enabled && uma.spec.type.linux> - UMA_OPTIMIZATION_CFLAGS+=-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 - ifndef USE_PPC_GCC - UMA_OPTIMIZATION_CFLAGS+=-qsimd=noauto - endif - - <#elseif uma.spec.processor.s390> - UMA_OPTIMIZATION_CFLAGS+=-O3 -mtune=z10 -march=z9-109 -mzarch + <#if uma.spec.properties.uma_optimization_cflags.defined> + UMA_OPTIMIZATION_CFLAGS += ${uma.spec.properties.uma_optimization_cflags.value} <#else> - UMA_OPTIMIZATION_CFLAGS+=-O - - -<#if uma.spec.properties.uma_optimization_cxxflags.defined> - UMA_OPTIMIZATION_CXXFLAGS+=${uma.spec.properties.uma_optimization_cxxflags.value} -<#else> - <#if uma.spec.processor.amd64> - UMA_OPTIMIZATION_CXXFLAGS+=-O3 -fno-strict-aliasing - <#elseif uma.spec.processor.x86> - UMA_OPTIMIZATION_CXXFLAGS+=-O3 -fno-strict-aliasing -march=pentium4 -mtune=prescott -mpreferred-stack-boundary=4 - <#elseif uma.spec.processor.arm> - UMA_OPTIMIZATION_CXXFLAGS+=-g -O3 -fno-strict-aliasing $(ARM_ARCH_FLAGS) -Wno-unused-but-set-variable - <#elseif uma.spec.processor.ppc> - UMA_OPTIMIZATION_CXXFLAGS+=-O3 - <#if uma.spec.flags.env_littleEndian.enabled && uma.spec.type.linux> - UMA_OPTIMIZATION_CXXFLAGS+=-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 + <#if uma.spec.processor.amd64> + UMA_OPTIMIZATION_CFLAGS += -O3 -fno-strict-aliasing + <#elseif uma.spec.processor.x86> + UMA_OPTIMIZATION_CFLAGS += -O3 -fno-strict-aliasing -march=pentium4 -mtune=prescott -mpreferred-stack-boundary=4 + <#elseif uma.spec.processor.arm> + UMA_OPTIMIZATION_CFLAGS += -g -O3 -fno-strict-aliasing $(ARM_ARCH_FLAGS) -Wno-unused-but-set-variable + <#elseif uma.spec.processor.ppc> + UMA_OPTIMIZATION_CFLAGS += -O3 + <#if uma.spec.flags.env_littleEndian.enabled && uma.spec.type.linux> + UMA_OPTIMIZATION_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 + ifndef USE_PPC_GCC + UMA_OPTIMIZATION_CFLAGS += -qsimd=noauto + endif + + <#elseif uma.spec.processor.s390> + UMA_OPTIMIZATION_CFLAGS += -O3 -mtune=z10 -march=z9-109 -mzarch + <#else> + UMA_OPTIMIZATION_CFLAGS += -O + - <#elseif uma.spec.processor.s390> - UMA_OPTIMIZATION_CXXFLAGS+=-O3 -mtune=z10 -march=z9-109 -mzarch + <#if uma.spec.properties.uma_optimization_cxxflags.defined> + UMA_OPTIMIZATION_CXXFLAGS += ${uma.spec.properties.uma_optimization_cxxflags.value} <#else> - UMA_OPTIMIZATION_CXXFLAGS+=-O + <#if uma.spec.processor.amd64> + UMA_OPTIMIZATION_CXXFLAGS += -O3 -fno-strict-aliasing + <#elseif uma.spec.processor.x86> + UMA_OPTIMIZATION_CXXFLAGS += -O3 -fno-strict-aliasing -march=pentium4 -mtune=prescott -mpreferred-stack-boundary=4 + <#elseif uma.spec.processor.arm> + UMA_OPTIMIZATION_CXXFLAGS += -g -O3 -fno-strict-aliasing $(ARM_ARCH_FLAGS) -Wno-unused-but-set-variable + <#elseif uma.spec.processor.ppc> + UMA_OPTIMIZATION_CXXFLAGS += -O3 + <#if uma.spec.flags.env_littleEndian.enabled && uma.spec.type.linux> + UMA_OPTIMIZATION_CXXFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 + + <#elseif uma.spec.processor.s390> + UMA_OPTIMIZATION_CXXFLAGS += -O3 -mtune=z10 -march=z9-109 -mzarch + <#else> + UMA_OPTIMIZATION_CXXFLAGS += -O + - else - UMA_OPTIMIZATION_CFLAGS+=-O0 - UMA_OPTIMIZATION_CXXFLAGS+=-O0 + UMA_OPTIMIZATION_CFLAGS += -O0 + UMA_OPTIMIZATION_CXXFLAGS += -O0 endif - -CFLAGS+=$(UMA_OPTIMIZATION_CFLAGS) -CXXFLAGS+=$(UMA_OPTIMIZATION_CXXFLAGS) +CFLAGS += $(UMA_OPTIMIZATION_CFLAGS) +CXXFLAGS += $(UMA_OPTIMIZATION_CXXFLAGS) <#if uma.spec.processor.ppc> -ifdef USE_PPC_GCC - PPC_GCC_CXXFLAGS+=-O3 -fno-strict-aliasing -endif + ifdef USE_PPC_GCC + PPC_GCC_CXXFLAGS += -O3 -fno-strict-aliasing + endif <#-- GCC versions greater than 5 default to GNU11 but OpenJ9 uses @@ -160,379 +158,378 @@ semantics. Reference - https://gcc.gnu.org/gcc-5/porting_to.html. --> GCCVERSIONGTEQ5 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 5) ifeq "$(GCCVERSIONGTEQ5)" "1" - CFLAGS+=-fgnu89-inline + CFLAGS += -fgnu89-inline endif <#if !uma.spec.processor.ppc> -CXXFLAGS+=-fno-exceptions -fno-rtti -fno-threadsafe-statics + CXXFLAGS += -fno-exceptions -fno-rtti -fno-threadsafe-statics <#else> - <#if uma.spec.flags.env_gcc.enabled> - CXXFLAGS+=-fno-exceptions -fno-rtti -fno-threadsafe-statics - <#else> - CXXFLAGS+=-qnortti - ifndef UMA_COMPILING_OMR_GTEST_BASED_CODE - # don't use this flag for gtest based code. - CXXFLAGS+=-qnoeh - endif - + <#if uma.spec.flags.env_gcc.enabled> + CXXFLAGS += -fno-exceptions -fno-rtti -fno-threadsafe-statics + <#else> + CXXFLAGS += -qnortti + ifndef UMA_COMPILING_OMR_GTEST_BASED_CODE + # don't use this flag for gtest based code. + CXXFLAGS += -qnoeh + endif + <#if uma.spec.processor.ppc> -ifdef USE_PPC_GCC - PPC_GCC_CXXFLAGS+=-fno-rtti -fno-threadsafe-statics -fno-exceptions -endif + ifdef USE_PPC_GCC + PPC_GCC_CXXFLAGS += -fno-rtti -fno-threadsafe-statics -fno-exceptions + endif -ASFLAGS+=-noexecstack +ASFLAGS += -noexecstack <#if uma.spec.processor.ppc> - <#if uma.spec.flags.env_gcc.enabled> - ifdef j9vm_env_data64 - ASFLAGS+=-a64 -mppc64 - else - ASFLAGS+=-a32 -mppc64 - endif - <#else> - ASFLAGS+=-c -o $*.o -qpic=large - ifdef j9vm_env_data64 - ASFLAGS+=-q64 - <#if uma.spec.flags.env_littleEndian.enabled> - ASFLAGS+=-qarch=pwr7 - <#else> - ASFLAGS+=-qarch=ppc64 - - else - ASFLAGS+=-qarch=ppc - endif - + <#if uma.spec.flags.env_gcc.enabled> + ifdef j9vm_env_data64 + ASFLAGS += -a64 -mppc64 + else + ASFLAGS += -a32 -mppc64 + endif + <#else> + ASFLAGS += -c -o $*.o -qpic=large + ifdef j9vm_env_data64 + ASFLAGS += -q64 + <#if uma.spec.flags.env_littleEndian.enabled> + ASFLAGS += -qarch=pwr7 + <#else> + ASFLAGS += -qarch=ppc64 + + else + ASFLAGS += -qarch=ppc + endif + <#if uma.spec.processor.s390> -ifndef j9vm_env_data64 -ASFLAGS+= -mzarch -endif -ASFLAGS+= -march=z9-109 $(J9M31) $(VMASMDEBUG) -o $*.o + ifndef j9vm_env_data64 + ASFLAGS += -mzarch + endif + ASFLAGS += -march=z9-109 $(J9M31) $(VMASMDEBUG) -o $*.o <#if uma.spec.processor.x86> -ASFLAGS+=-32 + ASFLAGS += -32 <#if uma.spec.processor.amd64> -ASFLAGS+=-64 + ASFLAGS += -64 <#if uma.spec.processor.arm> -ASFLAGS+=-march=armv6 -mfpu=vfp -mfloat-abi=hard + ASFLAGS += -march=armv6 -mfpu=vfp -mfloat-abi=hard ifdef j9vm_uma_gnuDebugSymbols -CFLAGS+=-g -CXXFLAGS+=-g -<#if uma.spec.processor.ppc> -ifdef USE_PPC_GCC - PPC_GCC_CXXFLAGS+=-g -endif - -<#if uma.spec.processor.x86 || uma.spec.processor.amd64> -ASFLAGS+=--gdwarf2 - + CFLAGS += -g + CXXFLAGS += -g + <#if uma.spec.processor.ppc> + ifdef USE_PPC_GCC + PPC_GCC_CXXFLAGS += -g + endif + + <#if uma.spec.processor.x86 || uma.spec.processor.amd64> + ASFLAGS += --gdwarf2 + endif -<#if uma.spec.processor.x86 || uma.spec.processor.amd64 > -<#-- GCC compilers support dependency generation --> -CFLAGS+=-MMD -CPPFLAGS+=-MMD -CXXFLAGS+=-MMD +<#if uma.spec.processor.x86 || uma.spec.processor.amd64> + <#-- GCC compilers support dependency generation --> + CFLAGS += -MMD + CPPFLAGS += -MMD + CXXFLAGS += -MMD -CFLAGS+=-DLINUX -D_REENTRANT -D_FILE_OFFSET_BITS=64 -CXXFLAGS+=-DLINUX -D_REENTRANT -D_FILE_OFFSET_BITS=64 -CPPFLAGS+=-DLINUX -D_REENTRANT +CFLAGS += -DLINUX -D_REENTRANT -D_FILE_OFFSET_BITS=64 +CXXFLAGS += -DLINUX -D_REENTRANT -D_FILE_OFFSET_BITS=64 +CPPFLAGS += -DLINUX -D_REENTRANT <#if uma.spec.processor.ppc> -ifdef USE_PPC_GCC - PPC_GCC_CXXFLAGS+=-DLINUX -D_REENTRANT -D_FILE_OFFSET_BITS=64 -endif + ifdef USE_PPC_GCC + PPC_GCC_CXXFLAGS += -DLINUX -D_REENTRANT -D_FILE_OFFSET_BITS=64 + endif <#-- Add Position Indepdent compile flag --> <#if uma.spec.processor.amd64 || uma.spec.processor.arm || uma.spec.processor.s390> -CFLAGS+=-fPIC -CXXFLAGS+=-fPIC + CFLAGS += -fPIC + CXXFLAGS += -fPIC <#elseif uma.spec.processor.ppc> - <#if uma.spec.flags.env_gcc.enabled> - CFLAGS+=-fpic - CXXFLAGS+=-fpic - <#else> - CFLAGS+=-qpic=large - CXXFLAGS+=-qpic=large - - ifdef USE_PPC_GCC - PPC_GCC_CXXFLAGS+=-fPIC - endif + <#if uma.spec.flags.env_gcc.enabled> + CFLAGS += -fpic + CXXFLAGS += -fpic + <#else> + CFLAGS += -qpic=large + CXXFLAGS += -qpic=large + + ifdef USE_PPC_GCC + PPC_GCC_CXXFLAGS += -fPIC + endif <#else> -<#-- Used for GOT's under 4k, should we just go -fPIC for everyone? --> -CFLAGS+=-fpic -CXXFLAGS+=-fpic + <#-- Used for GOT's under 4k, should we just go -fPIC for everyone? --> + CFLAGS += -fpic + CXXFLAGS += -fpic ifdef j9vm_uma_supportsIpv6 - CFLAGS+=-DIPv6_FUNCTION_SUPPORT - CXXFLAGS+=-DIPv6_FUNCTION_SUPPORT - CPPFLAGS+=-DIPv6_FUNCTION_SUPPORT -<#if uma.spec.processor.ppc> -ifdef USE_PPC_GCC - PPC_GCC_CXXFLAGS+=-DIPv6_FUNCTION_SUPPORT -endif - + CFLAGS += -DIPv6_FUNCTION_SUPPORT + CXXFLAGS += -DIPv6_FUNCTION_SUPPORT + CPPFLAGS += -DIPv6_FUNCTION_SUPPORT + <#if uma.spec.processor.ppc> + ifdef USE_PPC_GCC + PPC_GCC_CXXFLAGS += -DIPv6_FUNCTION_SUPPORT + endif + endif <#if uma.spec.processor.amd64> -CFLAGS+=-DJ9HAMMER -m64 -CXXFLAGS+=-DJ9HAMMER -m64 -CPPFLAGS+=-DJ9HAMMER -m64 + CFLAGS += -DJ9HAMMER -m64 + CXXFLAGS += -DJ9HAMMER -m64 + CPPFLAGS += -DJ9HAMMER -m64 <#elseif uma.spec.processor.arm> -CFLAGS+=-DJ9ARM -DARMGNU -DARM -DFIXUP_UNALIGNED -I$(XCOMP_TOOLCHAIN_BASEDIR)/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/include -CXXFLAGS+=-DJ9ARM -DARMGNU -DARM -DFIXUP_UNALIGNED -I$(XCOMP_TOOLCHAIN_BASEDIR)/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/include -fno-threadsafe-statics -CPPFLAGS+=-DJ9ARM -DARMGNU -DARM -DFIXUP_UNALIGNED-I$(XCOMP_TOOLCHAIN_BASEDIR)/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/include + CFLAGS += -DJ9ARM -DARMGNU -DARM -DFIXUP_UNALIGNED -I$(XCOMP_TOOLCHAIN_BASEDIR)/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/include + CXXFLAGS += -DJ9ARM -DARMGNU -DARM -DFIXUP_UNALIGNED -I$(XCOMP_TOOLCHAIN_BASEDIR)/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/include -fno-threadsafe-statics + CPPFLAGS += -DJ9ARM -DARMGNU -DARM -DFIXUP_UNALIGNED-I$(XCOMP_TOOLCHAIN_BASEDIR)/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/include <#elseif uma.spec.processor.ppc> -CFLAGS+=-DLINUXPPC -CXXFLAGS+=-DLINUXPPC -CPPFLAGS+=-DLINUXPPC - <#if uma.spec.flags.env_gcc.enabled> - ifdef j9vm_env_data64 - CFLAGS+=-m64 -DLINUXPPC64 -DPPC64 - CXXFLAGS+=-m64 -DLINUXPPC64 -DPPC64 - CPPFLAGS+=-m64 -DLINUXPPC64 -DPPC64 - else - CFLAGS+=-m32 - CXXFLAGS+=-m32 - CPPFLAGS+=-m32 - endif - <#else> - CFLAGS+=-qalias=noansi -qxflag=LTOL:LTOL0 -qxflag=selinux - CXXFLAGS+=-qalias=noansi -qxflag=LTOL:LTOL0 -qxflag=selinux -qsuppress=1540-1087:1540-1088:1540-1090 - ifdef j9vm_env_data64 - <#if uma.spec.flags.env_littleEndian.enabled> - CFLAGS+=-qarch=pwr7 - CXXFLAGS+=-qarch=pwr7 - <#else> - CFLAGS+=-qarch=ppc64 - CXXFLAGS+=-qarch=ppc64 - - CFLAGS+=-q64 -DLINUXPPC64 -DPPC64 - CXXFLAGS+=-q64 -DLINUXPPC64 -DPPC64 - CPPFLAGS+=-DLINUXPPC64 -DPPC64 - else - CFLAGS+=-qarch=ppc - CXXFLAGS+=-qarch=ppc - endif - - ifdef j9vm_env_data64 - ifdef USE_PPC_GCC - PPC_GCC_CXXFLAGS+=-DLINUXPPC -DLINUXPPC64 -DPPC64 -m64 - endif - else - ifdef USE_PPC_GCC - PPC_GCC_CXXFLAGS+=-DLINUXPPC -m32 - endif - endif + CFLAGS += -DLINUXPPC + CXXFLAGS += -DLINUXPPC + CPPFLAGS += -DLINUXPPC + <#if uma.spec.flags.env_gcc.enabled> + ifdef j9vm_env_data64 + CFLAGS += -m64 -DLINUXPPC64 -DPPC64 + CXXFLAGS += -m64 -DLINUXPPC64 -DPPC64 + CPPFLAGS += -m64 -DLINUXPPC64 -DPPC64 + else + CFLAGS += -m32 + CXXFLAGS += -m32 + CPPFLAGS += -m32 + endif + <#else> + CFLAGS += -qalias=noansi -qxflag=LTOL:LTOL0 -qxflag=selinux + CXXFLAGS += -qalias=noansi -qxflag=LTOL:LTOL0 -qxflag=selinux -qsuppress=1540-1087:1540-1088:1540-1090 + ifdef j9vm_env_data64 + <#if uma.spec.flags.env_littleEndian.enabled> + CFLAGS += -qarch=pwr7 + CXXFLAGS += -qarch=pwr7 + <#else> + CFLAGS += -qarch=ppc64 + CXXFLAGS += -qarch=ppc64 + + CFLAGS += -q64 -DLINUXPPC64 -DPPC64 + CXXFLAGS += -q64 -DLINUXPPC64 -DPPC64 + CPPFLAGS += -DLINUXPPC64 -DPPC64 + else + CFLAGS += -qarch=ppc + CXXFLAGS += -qarch=ppc + endif + + ifdef j9vm_env_data64 + ifdef USE_PPC_GCC + PPC_GCC_CXXFLAGS += -DLINUXPPC -DLINUXPPC64 -DPPC64 -m64 + endif + else + ifdef USE_PPC_GCC + PPC_GCC_CXXFLAGS += -DLINUXPPC -m32 + endif + endif <#elseif uma.spec.processor.s390> -CFLAGS+=$(J9M31) -DS390 -D_LONG_LONG -DJ9VM_TIERED_CODE_CACHE -fno-strict-aliasing -CXXFLAGS+=$(J9M31) -DS390 -D_LONG_LONG -DJ9VM_TIERED_CODE_CACHE -fno-strict-aliasing -CPPFLAGS+=-DS390 -D_LONG_LONG -DJ9VM_TIERED_CODE_CACHE -ifdef j9vm_env_data64 - CFLAGS+=-DS39064 - CXXFLAGS+=-DS39064 - CPPFLAGS+=-DS39064 -endif + CFLAGS += $(J9M31) -DS390 -D_LONG_LONG -DJ9VM_TIERED_CODE_CACHE -fno-strict-aliasing + CXXFLAGS += $(J9M31) -DS390 -D_LONG_LONG -DJ9VM_TIERED_CODE_CACHE -fno-strict-aliasing + CPPFLAGS += -DS390 -D_LONG_LONG -DJ9VM_TIERED_CODE_CACHE + ifdef j9vm_env_data64 + CFLAGS += -DS39064 + CXXFLAGS += -DS39064 + CPPFLAGS += -DS39064 + endif <#elseif uma.spec.processor.x86> -CFLAGS+=-DJ9X86 -m32 -msse2 -CXXFLAGS+=-DJ9X86 -m32 -msse2 -I/usr/include/nptl -fno-threadsafe-statics -CPPFLAGS+=-DJ9X86 -m32 -msse2 -I/usr/include/nptl + CFLAGS += -DJ9X86 -m32 -msse2 + CXXFLAGS += -DJ9X86 -m32 -msse2 -I/usr/include/nptl -fno-threadsafe-statics + CPPFLAGS += -DJ9X86 -m32 -msse2 -I/usr/include/nptl <#if uma.spec.processor.ppc && !uma.spec.flags.env_gcc.enabled> -ifdef j9vm_env_data64 - UMA_DLL_LINK_FLAGS+=-q64 -endif -UMA_DLL_LINK_FLAGS+=-qmkshrobj -qxflag=selinux -Wl,-Map=$(UMA_TARGET_NAME).map -UMA_DLL_LINK_FLAGS+=-Wl,-soname=$(UMA_DLLFILENAME),--version-script=$(UMA_TARGET_NAME).exp + ifdef j9vm_env_data64 + UMA_DLL_LINK_FLAGS += -q64 + endif + UMA_DLL_LINK_FLAGS += -qmkshrobj -qxflag=selinux -Wl,-Map=$(UMA_TARGET_NAME).map + UMA_DLL_LINK_FLAGS += -Wl,-soname=$(UMA_DLLFILENAME),--version-script=$(UMA_TARGET_NAME).exp -UMA_DLL_LINK_POSTFLAGS+=-Wl,--start-group $(UMA_LINK_STATIC_LIBRARIES) -Wl,--end-group -UMA_DLL_LINK_POSTFLAGS+=$(UMA_LINK_SHARED_LIBRARIES) -UMA_DLL_LINK_POSTFLAGS+=-lm -lpthread -lc -Wl,-z,origin,-rpath,\$$ORIGIN,--disable-new-dtags,-rpath-link,$(UMA_PATH_TO_ROOT) + UMA_DLL_LINK_POSTFLAGS += -Wl,--start-group $(UMA_LINK_STATIC_LIBRARIES) -Wl,--end-group + UMA_DLL_LINK_POSTFLAGS += $(UMA_LINK_SHARED_LIBRARIES) + UMA_DLL_LINK_POSTFLAGS += -lm -lpthread -lc -Wl,-z,origin,-rpath,\$$ORIGIN,--disable-new-dtags,-rpath-link,$(UMA_PATH_TO_ROOT) <#else> -UMA_DLL_LINK_FLAGS+=-shared -ifdef UMA_USING_LD_TO_LINK - UMA_DLL_LINK_FLAGS+=-Map $(UMA_TARGET_NAME).map - UMA_DLL_LINK_FLAGS+=--version-script $(UMA_TARGET_NAME).exp - UMA_DLL_LINK_FLAGS+=-soname=$(UMA_DLLFILENAME) - UMA_DLL_LINK_FLAGS+=-z origin -rpath \$$ORIGIN --disable-new-dtags -else - UMA_DLL_LINK_FLAGS+=-Wl,-Map=$(UMA_TARGET_NAME).map - UMA_DLL_LINK_FLAGS+=-Wl,--version-script,$(UMA_TARGET_NAME).exp - UMA_DLL_LINK_FLAGS+=-Wl,-soname=$(UMA_DLLFILENAME) - UMA_DLL_LINK_FLAGS+=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN -Xlinker --disable-new-dtags + UMA_DLL_LINK_FLAGS += -shared + ifdef UMA_USING_LD_TO_LINK + UMA_DLL_LINK_FLAGS+=-Map $(UMA_TARGET_NAME).map + UMA_DLL_LINK_FLAGS+=--version-script $(UMA_TARGET_NAME).exp + UMA_DLL_LINK_FLAGS+=-soname=$(UMA_DLLFILENAME) + UMA_DLL_LINK_FLAGS+=-z origin -rpath \$$ORIGIN --disable-new-dtags + else + UMA_DLL_LINK_FLAGS += -Wl,-Map=$(UMA_TARGET_NAME).map + UMA_DLL_LINK_FLAGS += -Wl,--version-script,$(UMA_TARGET_NAME).exp + UMA_DLL_LINK_FLAGS += -Wl,-soname=$(UMA_DLLFILENAME) + UMA_DLL_LINK_FLAGS += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN -Xlinker --disable-new-dtags endif ifdef UMA_USING_LD_TO_LINK - UMA_DLL_LINK_POSTFLAGS+=--start-group + UMA_DLL_LINK_POSTFLAGS += --start-group else - UMA_DLL_LINK_POSTFLAGS+=-Xlinker --start-group + UMA_DLL_LINK_POSTFLAGS += -Xlinker --start-group endif -UMA_DLL_LINK_POSTFLAGS+=$(UMA_LINK_STATIC_LIBRARIES) + UMA_DLL_LINK_POSTFLAGS += $(UMA_LINK_STATIC_LIBRARIES) ifdef UMA_USING_LD_TO_LINK - UMA_DLL_LINK_POSTFLAGS+=--end-group + UMA_DLL_LINK_POSTFLAGS += --end-group else - UMA_DLL_LINK_POSTFLAGS+=-Xlinker --end-group + UMA_DLL_LINK_POSTFLAGS += -Xlinker --end-group endif -UMA_DLL_LINK_POSTFLAGS+=$(UMA_LINK_SHARED_LIBRARIES) + UMA_DLL_LINK_POSTFLAGS += $(UMA_LINK_SHARED_LIBRARIES) -ifdef j9vm_uma_gnuDebugSymbols -UMA_DLL_LINK_POSTFLAGS+=-g -endif + ifdef j9vm_uma_gnuDebugSymbols + UMA_DLL_LINK_POSTFLAGS += -g + endif -<#if uma.spec.processor.x86> - UMA_DLL_LINK_FLAGS+=-m32 - -<#if uma.spec.processor.amd64> - UMA_DLL_LINK_FLAGS+=-m64 - + <#if uma.spec.processor.x86> + UMA_DLL_LINK_FLAGS += -m32 + + <#if uma.spec.processor.amd64> + UMA_DLL_LINK_FLAGS += -m64 + -<#if uma.spec.processor.ppc && uma.spec.flags.env_gcc.enabled> -ifdef j9vm_env_data64 - UMA_EXE_PREFIX_FLAGS+=-m64 - UMA_DLL_LINK_FLAGS+=-m64 -else - UMA_EXE_PREFIX_FLAGS+=-m32 - UMA_DLL_LINK_FLAGS+=-m32 -endif - + <#if uma.spec.processor.ppc && uma.spec.flags.env_gcc.enabled> + ifdef j9vm_env_data64 + UMA_EXE_PREFIX_FLAGS += -m64 + UMA_DLL_LINK_FLAGS += -m64 + else + UMA_EXE_PREFIX_FLAGS += -m32 + UMA_DLL_LINK_FLAGS += -m32 + endif + + + <#if uma.spec.processor.x86> + UMA_DLL_LINK_POSTFLAGS += -lc -lm -ldl + <#else> + ifdef UMA_IS_C_PLUS_PLUS + UMA_DLL_LINK_POSTFLAGS += -lc + endif + UMA_DLL_LINK_POSTFLAGS += -lm + -<#if uma.spec.processor.x86> -UMA_DLL_LINK_POSTFLAGS+=-lc -lm -ldl - <#else> -ifdef UMA_IS_C_PLUS_PLUS - UMA_DLL_LINK_POSTFLAGS+=-lc -endif -UMA_DLL_LINK_POSTFLAGS+=-lm - - <#if uma.spec.processor.s390> -UMA_DLL_LINK_FLAGS+=$(J9M31) -UMA_DLL_LINK_POSTFLAGS+=-Xlinker -z -Xlinker origin -UMA_DLL_LINK_POSTFLAGS+=-Xlinker -rpath -Xlinker \$$ORIGIN -Xlinker --disable-new-dtags -UMA_DLL_LINK_POSTFLAGS+=-Xlinker -rpath-link -Xlinker $(UMA_PATH_TO_ROOT) + UMA_DLL_LINK_FLAGS += $(J9M31) + UMA_DLL_LINK_POSTFLAGS += -Xlinker -z -Xlinker origin + UMA_DLL_LINK_POSTFLAGS += -Xlinker -rpath -Xlinker \$$ORIGIN -Xlinker --disable-new-dtags + UMA_DLL_LINK_POSTFLAGS += -Xlinker -rpath-link -Xlinker $(UMA_PATH_TO_ROOT) <#if uma.spec.processor.s390> -ifdef j9vm_jit_32bitUses64bitRegisters - UMA_M4_FLAGS+=-DJ9VM_JIT_32BIT_USES64BIT_REGISTERS -endif + ifdef j9vm_jit_32bitUses64bitRegisters + UMA_M4_FLAGS += -DJ9VM_JIT_32BIT_USES64BIT_REGISTERS + endif <#if uma.spec.processor.arm> -$(patsubst %.s,%.o,$(filter %.s,$(UMA_FILES_TO_PREPROCESS))): %$(UMA_DOT_O): %.s +$(patsubst %.s,%.o,$(filter %.s,$(UMA_FILES_TO_PREPROCESS))) : %$(UMA_DOT_O) : %.s sed -f $(UMA_PATH_TO_ROOT)compiler/build/scripts/armasm2gas.sed $*.s > $*.S $(CPP) $(CPPFLAGS) $(UMA_C_INCLUDES) $*.S > $*.spp -rm $*.S $(AS) $(ASFLAGS) $(VMASMDEBUG) -o $*.o $*.spp -rm $*.spp <#elseif uma.spec.processor.ppc> -$(patsubst %.s,%.o,$(filter %.s,$(UMA_FILES_TO_PREPROCESS))): %$(UMA_DOT_O): %.s +$(patsubst %.s,%.o,$(filter %.s,$(UMA_FILES_TO_PREPROCESS))) : %$(UMA_DOT_O) : %.s $(CPP) -P $(CPPFLAGS) $*.s | sed 's/\!/\#/g' > $*.spp.s $(AS) $(ASFLAGS) $*.spp.s -rm $*.spp.s ifdef UMA_TREAT_WARNINGS_AS_ERRORS -ifndef UMA_SUPPRESS_WARNINGS_AS_ERRORS -<#if uma.spec.processor.ppc> - <#if uma.spec.flags.env_gcc.enabled> - CFLAGS+=-Wreturn-type -Werror - CXXFLAGS+=-Wreturn-type -Werror - <#else> - CFLAGS+=-qhalt=w - CXXFLAGS+=-qhalt=w - -ifdef USE_PPC_GCC - PPC_GCC_CXXFLAGS+=-Wreturn-type -Werror -endif -<#else> -CFLAGS+=-Wimplicit -Wreturn-type -Werror -CXXFLAGS+=-Wreturn-type -Werror - -endif + ifndef UMA_SUPPRESS_WARNINGS_AS_ERRORS + <#if uma.spec.processor.ppc> + <#if uma.spec.flags.env_gcc.enabled> + CFLAGS += -Wreturn-type -Werror + CXXFLAGS += -Wreturn-type -Werror + <#else> + CFLAGS += -qhalt=w + CXXFLAGS += -qhalt=w + + ifdef USE_PPC_GCC + PPC_GCC_CXXFLAGS += -Wreturn-type -Werror + endif + <#else> + CFLAGS += -Wimplicit -Wreturn-type -Werror + CXXFLAGS += -Wreturn-type -Werror + + endif endif ifdef UMA_ENABLE_ALL_WARNINGS -ifndef UMA_SUPPRESS_ALL_WARNINGS -<#if uma.spec.processor.ppc> -CFLAGS+= -CXXFLAGS+= -ifdef USE_PPC_GCC - PPC_GCC_CXXFLAGS+=-Wall -Wno-non-virtual-dtor -endif -<#else> -CFLAGS+=-Wall -CXXFLAGS+=-Wall -Wno-non-virtual-dtor - -endif + ifndef UMA_SUPPRESS_ALL_WARNINGS + <#if uma.spec.processor.ppc> + CFLAGS += + CXXFLAGS += + ifdef USE_PPC_GCC + PPC_GCC_CXXFLAGS += -Wall -Wno-non-virtual-dtor + endif + <#else> + CFLAGS += -Wall + CXXFLAGS += -Wall -Wno-non-virtual-dtor + + endif endif <#if uma.spec.flags.env_advanceToolchain.enabled> -AT_HOME=/opt/at7.0-0-rc3 - -<#if uma.spec.flags.env_gcc.enabled> -# -AS=$(AT_HOME)/bin/as -CC=$(AT_HOME)/bin/cc -CXX=$(AT_HOME)/bin/c++ -UMA_DLL_LD=$(AT_HOME)/bin/cc -UMA_EXE_LD=$(AT_HOME)/bin/cc -<#else> -# We always need to invoke xlc (also used to link and assemble) with -# the -F option. This raises an additional warning which -# we'll also want to suppress. -# -AT_CONFIG=$(AT_HOME)/scripts/vac-12_1-AT7_0-0-RC3.dfp.cfg -UMA_EXE_LD+=-F $(AT_CONFIG) -qsuppress=1501-274 -UMA_DLL_LD+=-F $(AT_CONFIG) -qsuppress=1501-274 -CFLAGS+=-F $(AT_CONFIG) -qsuppress=1501-274 -CXXFLAGS+=-F $(AT_CONFIG) -qsuppress=1501-274 -ASFLAGS+=-F $(AT_CONFIG) -qsuppress=1501-274 - - + AT_HOME = /opt/at7.0-0-rc3 + + <#if uma.spec.flags.env_gcc.enabled> + # + AS = $(AT_HOME)/bin/as + CC = $(AT_HOME)/bin/cc + CXX = $(AT_HOME)/bin/c++ + UMA_DLL_LD = $(AT_HOME)/bin/cc + UMA_EXE_LD = $(AT_HOME)/bin/cc + <#else> + # We always need to invoke xlc (also used to link and assemble) with + # the -F option. This raises an additional warning which + # we'll also want to suppress. + # + AT_CONFIG = $(AT_HOME)/scripts/vac-12_1-AT7_0-0-RC3.dfp.cfg + UMA_EXE_LD += -F $(AT_CONFIG) -qsuppress=1501-274 + UMA_DLL_LD += -F $(AT_CONFIG) -qsuppress=1501-274 + CFLAGS += -F $(AT_CONFIG) -qsuppress=1501-274 + CXXFLAGS += -F $(AT_CONFIG) -qsuppress=1501-274 + ASFLAGS += -F $(AT_CONFIG) -qsuppress=1501-274 + <#if uma.spec.processor.ppc && !uma.spec.type.aix> ifdef USE_PPC_GCC # special handling BytecodeInterpreter.cpp and DebugBytecodeInterpreter.cpp -BytecodeInterpreter$(UMA_DOT_O):BytecodeInterpreter.cpp +BytecodeInterpreter$(UMA_DOT_O) : BytecodeInterpreter.cpp $(PPC_GCC_CXX) $(PPC_GCC_CXXFLAGS) -c $< -DebugBytecodeInterpreter$(UMA_DOT_O):DebugBytecodeInterpreter.cpp +DebugBytecodeInterpreter$(UMA_DOT_O) : DebugBytecodeInterpreter.cpp $(PPC_GCC_CXX) $(PPC_GCC_CXXFLAGS) -c $< -MHInterpreter$(UMA_DOT_O):MHInterpreter.cpp +MHInterpreter$(UMA_DOT_O) : MHInterpreter.cpp $(PPC_GCC_CXX) $(PPC_GCC_CXXFLAGS) -c $< endif <#if uma.spec.processor.amd64> # special handling BytecodeInterpreter.cpp and DebugBytecodeInterpreter.cpp -BytecodeInterpreter$(UMA_DOT_O):BytecodeInterpreter.cpp +BytecodeInterpreter$(UMA_DOT_O) : BytecodeInterpreter.cpp $(INTERP_GCC) $(CXXFLAGS) -c $< -DebugBytecodeInterpreter$(UMA_DOT_O):DebugBytecodeInterpreter.cpp +DebugBytecodeInterpreter$(UMA_DOT_O) : DebugBytecodeInterpreter.cpp $(INTERP_GCC) $(CXXFLAGS) -c $< -MHInterpreter$(UMA_DOT_O):MHInterpreter.cpp +MHInterpreter$(UMA_DOT_O) : MHInterpreter.cpp $(INTERP_GCC) $(CXXFLAGS) -c $< - + # Special handling for unused result warnings. -closures$(UMA_DOT_O):closures.c +closures$(UMA_DOT_O) : closures.c $(CC) $(CFLAGS) -Wno-unused-result -c -o $@ $< - -j9process$(UMA_DOT_O):j9process.c + +j9process$(UMA_DOT_O) : j9process.c $(CC) $(CFLAGS) -Wno-unused-result -c -o $@ $< - + diff --git a/runtime/makelib/targets.mk.osx.inc.ftl b/runtime/makelib/targets.mk.osx.inc.ftl index 279bbb84428..c1374e7b0e6 100644 --- a/runtime/makelib/targets.mk.osx.inc.ftl +++ b/runtime/makelib/targets.mk.osx.inc.ftl @@ -1,5 +1,5 @@ <#-- -Copyright (c) 1998, 2017 IBM Corp. and others +Copyright (c) 1998, 2018 IBM Corp. and others This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 which accompanies this @@ -21,138 +21,137 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti --> <#assign lib_target_rule> -$(UMA_LIBTARGET): $(UMA_OBJECTS) +$(UMA_LIBTARGET) : $(UMA_OBJECTS) $(AR) rcv $(UMA_LIBTARGET) $(UMA_OBJECTS) <#assign dll_target_rule> $(UMA_DLLTARGET): $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) $(UMA_DLL_LD) $(UMA_DLL_LINK_FLAGS) \ - $(VMLINK) $(UMA_LINK_PATH) -o $(UMA_DLLTARGET)\ - $(UMA_OBJECTS) \ - $(UMA_DLL_LINK_POSTFLAGS) + $(VMLINK) $(UMA_LINK_PATH) -o $(UMA_DLLTARGET)\ + $(UMA_OBJECTS) \ + $(UMA_DLL_LINK_POSTFLAGS) <#assign exe_target_rule> $(UMA_EXETARGET): $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) $(UMA_EXE_LD) $(UMA_EXE_PREFIX_FLAGS) $(UMA_LINK_PATH) $(VMLINK) \ - $(UMA_OBJECTS) \ - $(UMA_BEGIN_DASH_L) \ - $(UMA_LINK_STATIC_LIBRARIES) \ - $(UMA_END_DASH_L) \ - $(UMA_LINK_SHARED_LIBRARIES) \ - -o $@ $(UMA_EXE_POSTFIX_FLAGS) + $(UMA_OBJECTS) \ + $(UMA_BEGIN_DASH_L) \ + $(UMA_LINK_STATIC_LIBRARIES) \ + $(UMA_END_DASH_L) \ + $(UMA_LINK_SHARED_LIBRARIES) \ + -o $@ $(UMA_EXE_POSTFIX_FLAGS) -UMA_BEGIN_DASH_L= -UMA_END_DASH_L= +UMA_BEGIN_DASH_L = +UMA_END_DASH_L = + +UMA_EXE_POSTFIX_FLAGS +=-lm -liconv -lc -ldl -lutil -Wl,-rpath,\$$ORIGIN -UMA_EXE_POSTFIX_FLAGS+=-lm -liconv -lc -ldl -lutil -Wl,-rpath,\$$ORIGIN - <#if uma.spec.processor.amd64> -UMA_MASM2GAS_FLAGS+=--64 + UMA_MASM2GAS_FLAGS += --64 ifndef UMA_DO_NOT_OPTIMIZE_CCODE -<#if uma.spec.properties.uma_optimization_cflags.defined> - UMA_OPTIMIZATION_CFLAGS+=${uma.spec.properties.uma_optimization_cflags.value} -<#else> - <#if uma.spec.processor.amd64> - UMA_OPTIMIZATION_CFLAGS+=-O3 -fno-strict-aliasing + <#if uma.spec.properties.uma_optimization_cflags.defined> + UMA_OPTIMIZATION_CFLAGS += ${uma.spec.properties.uma_optimization_cflags.value} <#else> - UMA_OPTIMIZATION_CFLAGS+=-O - - -<#if uma.spec.properties.uma_optimization_cxxflags.defined> - UMA_OPTIMIZATION_CXXFLAGS+=${uma.spec.properties.uma_optimization_cxxflags.value} -<#else> - <#if uma.spec.processor.amd64> - UMA_OPTIMIZATION_CXXFLAGS+=-O3 -fno-strict-aliasing - <#if uma.spec.flags.env_littleEndian.enabled && uma.spec.type.linux> - UMA_OPTIMIZATION_CXXFLAGS+=-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 + <#if uma.spec.processor.amd64> + UMA_OPTIMIZATION_CFLAGS +=-O3 -fno-strict-aliasing + <#else> + UMA_OPTIMIZATION_CFLAGS += -O + + <#if uma.spec.properties.uma_optimization_cxxflags.defined> + UMA_OPTIMIZATION_CXXFLAGS += ${uma.spec.properties.uma_optimization_cxxflags.value} <#else> - UMA_OPTIMIZATION_CXXFLAGS+=-O + <#if uma.spec.processor.amd64> + UMA_OPTIMIZATION_CXXFLAGS +=-O3 -fno-strict-aliasing + <#if uma.spec.flags.env_littleEndian.enabled && uma.spec.type.linux> + UMA_OPTIMIZATION_CXXFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 + + <#else> + UMA_OPTIMIZATION_CXXFLAGS += -O + - else - UMA_OPTIMIZATION_CFLAGS+=-O0 - UMA_OPTIMIZATION_CXXFLAGS+=-O0 + UMA_OPTIMIZATION_CFLAGS += -O0 + UMA_OPTIMIZATION_CXXFLAGS += -O0 endif - -CFLAGS+=$(UMA_OPTIMIZATION_CFLAGS) -CXXFLAGS+=$(UMA_OPTIMIZATION_CXXFLAGS) +CFLAGS += $(UMA_OPTIMIZATION_CFLAGS) +CXXFLAGS += $(UMA_OPTIMIZATION_CXXFLAGS) <#if uma.spec.flags.env_gcc.enabled> - CXXFLAGS+=-fno-exceptions -fno-threadsafe-statics + CXXFLAGS +=-fno-exceptions -fno-threadsafe-statics ifdef j9vm_uma_gnuDebugSymbols -CFLAGS+=-g -CXXFLAGS+=-g + CFLAGS += -g + CXXFLAGS += -g endif <#if uma.spec.processor.amd64 > -<#-- GCC compilers support dependency generation --> -CFLAGS+=-MMD -CPPFLAGS+=-MMD -CXXFLAGS+=-MMD + <#-- GCC compilers support dependency generation --> + CFLAGS += -MMD + CPPFLAGS += -MMD + CXXFLAGS += -MMD -CFLAGS+=-DOSX -D_REENTRANT -D_FILE_OFFSET_BITS=64 -CXXFLAGS+=-DOSX -D_REENTRANT -D_FILE_OFFSET_BITS=64 -CPPFLAGS+=-DOSX -D_REENTRANT +CFLAGS +=-DOSX -D_REENTRANT -D_FILE_OFFSET_BITS=64 +CXXFLAGS +=-DOSX -D_REENTRANT -D_FILE_OFFSET_BITS=64 +CPPFLAGS +=-DOSX -D_REENTRANT <#-- Add Position Indepdent compile flag --> -CFLAGS+=-fPIC -CXXFLAGS+=-fPIC +CFLAGS += -fPIC +CXXFLAGS += -fPIC ifdef j9vm_uma_supportsIpv6 - CFLAGS+=-DIPv6_FUNCTION_SUPPORT - CXXFLAGS+=-DIPv6_FUNCTION_SUPPORT - CPPFLAGS+=-DIPv6_FUNCTION_SUPPORT + CFLAGS += -DIPv6_FUNCTION_SUPPORT + CXXFLAGS += -DIPv6_FUNCTION_SUPPORT + CPPFLAGS += -DIPv6_FUNCTION_SUPPORT endif <#if uma.spec.processor.amd64> -CFLAGS+=-DJ9HAMMER -m64 -CXXFLAGS+=-DJ9HAMMER -m64 -CPPFLAGS+=-DJ9HAMMER -m64 + CFLAGS +=-DJ9HAMMER -m64 + CXXFLAGS +=-DJ9HAMMER -m64 + CPPFLAGS +=-DJ9HAMMER -m64 -UMA_DLL_LINK_FLAGS+=-shared -install_name lib$(UMA_TARGET_NAME).dylib +UMA_DLL_LINK_FLAGS +=-shared -install_name lib$(UMA_TARGET_NAME).dylib ifdef UMA_USING_LD_TO_LINK - UMA_DLL_LINK_FLAGS+=origin -rpath \$$ORIGIN --disable-new-dtags + UMA_DLL_LINK_FLAGS += origin -rpath \$$ORIGIN --disable-new-dtags else - UMA_DLL_LINK_FLAGS+=-Xlinker -rpath -Xlinker \$$ORIGIN + UMA_DLL_LINK_FLAGS += -Xlinker -rpath -Xlinker \$$ORIGIN endif -UMA_DLL_LINK_POSTFLAGS+=$(UMA_LINK_STATIC_LIBRARIES) -UMA_DLL_LINK_POSTFLAGS+=$(UMA_LINK_SHARED_LIBRARIES) +UMA_DLL_LINK_POSTFLAGS += $(UMA_LINK_STATIC_LIBRARIES) +UMA_DLL_LINK_POSTFLAGS += $(UMA_LINK_SHARED_LIBRARIES) ifdef j9vm_uma_gnuDebugSymbols -UMA_DLL_LINK_POSTFLAGS+=-g + UMA_DLL_LINK_POSTFLAGS += -g endif <#if uma.spec.processor.amd64> - UMA_DLL_LINK_FLAGS+=-m64 + UMA_DLL_LINK_FLAGS += -m64 ifdef UMA_IS_C_PLUS_PLUS - UMA_DLL_LINK_POSTFLAGS+=-lc + UMA_DLL_LINK_POSTFLAGS += -lc endif -UMA_DLL_LINK_POSTFLAGS+=-lm - +UMA_DLL_LINK_POSTFLAGS += -lm + ifdef UMA_TREAT_WARNINGS_AS_ERRORS -ifndef UMA_SUPPRESS_WARNINGS_AS_ERRORS - CFLAGS+=-Wimplicit -Wreturn-type -Werror - CXXFLAGS+=-Wreturn-type -Werror -endif + ifndef UMA_SUPPRESS_WARNINGS_AS_ERRORS + CFLAGS +=-Wimplicit -Wreturn-type -Werror + CXXFLAGS +=-Wreturn-type -Werror + endif endif ifdef UMA_ENABLE_ALL_WARNINGS -ifndef UMA_SUPPRESS_ALL_WARNINGS - CFLAGS+=-Wall - CXXFLAGS+=-Wall -Wno-non-virtual-dtor -endif + ifndef UMA_SUPPRESS_ALL_WARNINGS + CFLAGS += -Wall + CXXFLAGS +=-Wall -Wno-non-virtual-dtor + endif endif diff --git a/runtime/makelib/targets.mk.ztpf.inc.ftl b/runtime/makelib/targets.mk.ztpf.inc.ftl index b38ce162bc3..da791ce5117 100644 --- a/runtime/makelib/targets.mk.ztpf.inc.ftl +++ b/runtime/makelib/targets.mk.ztpf.inc.ftl @@ -1,48 +1,50 @@ -<#-- - Copyright (c) 1998, 2017 IBM Corp. and others - - This program and the accompanying materials are made available under - the terms of the Eclipse Public License 2.0 which accompanies this - distribution and is available at https://www.eclipse.org/legal/epl-2.0/ - or the Apache License, Version 2.0 which accompanies this distribution and - is available at https://www.apache.org/licenses/LICENSE-2.0. - - This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set - forth in the Eclipse Public License, v. 2.0 are satisfied: GNU - General Public License, version 2 with the GNU Classpath - Exception [1] and GNU General Public License, version 2 with the - OpenJDK Assembly Exception [2]. - - [1] https://www.gnu.org/software/classpath/license.html - [2] http://openjdk.java.net/legal/assembly-exception.html - - 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 +<#-- +Copyright (c) 1998, 2018 IBM Corp. and others + +This program and the accompanying materials are made available under +the terms of the Eclipse Public License 2.0 which accompanies this +distribution and is available at https://www.eclipse.org/legal/epl-2.0/ +or the Apache License, Version 2.0 which accompanies this distribution and +is available at https://www.apache.org/licenses/LICENSE-2.0. + +This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set +forth in the Eclipse Public License, v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath +Exception [1] and GNU General Public License, version 2 with the +OpenJDK Assembly Exception [2]. + +[1] https://www.gnu.org/software/classpath/license.html +[2] http://openjdk.java.net/legal/assembly-exception.html + +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 --> <#if uma.spec.properties.uma_crossCompilerPath.defined> # Put the tools on the path. -PATH:=${uma.spec.properties.crossCompilerPath.value}:<#noparse>${PATH} +PATH := ${uma.spec.properties.crossCompilerPath.value}:<#noparse>${PATH} <#assign lib_target_rule> -$(UMA_LIBTARGET): $(UMA_OBJECTS) +$(UMA_LIBTARGET) : $(UMA_OBJECTS) $(AR) rcv $(UMA_LIBTARGET) $(UMA_OBJECTS) + <#assign dll_target_rule> -$(UMA_DLLTARGET): $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) +$(UMA_DLLTARGET) : $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) $(UMA_DLL_LD) $(UMA_DLL_LINK_FLAGS) \ - $(VMLINK) $(UMA_LINK_PATH) -o $(UMA_DLLTARGET)\ - $(UMA_OBJECTS) \ - $(UMA_DLL_LINK_POSTFLAGS) + $(VMLINK) $(UMA_LINK_PATH) -o $(UMA_DLLTARGET)\ + $(UMA_OBJECTS) \ + $(UMA_DLL_LINK_POSTFLAGS) ifdef j9vm_uma_gnuDebugSymbols cp $(UMA_DLLTARGET) $(UMA_DLLTARGET).dbg objcopy --strip-debug $(UMA_DLLTARGET) - objcopy --add-gnu-debuglink=$(UMA_DLLTARGET).dbg $(UMA_DLLTARGET) + objcopy --add-gnu-debuglink=$(UMA_DLLTARGET).dbg $(UMA_DLLTARGET) endif + <#assign exe_target_rule> -$(UMA_EXETARGET): $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) +$(UMA_EXETARGET) : $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) $(UMA_EXE_LD) $(UMA_EXE_PREFIX_FLAGS) $(UMA_LINK_PATH) $(VMLINK) \ $(UMA_OBJECTS) \ $(UMA_BEGIN_DASH_L) \ @@ -52,151 +54,149 @@ $(UMA_EXETARGET): $(UMA_OBJECTS) $(UMA_TARGET_LIBRARIES) -o $@ $(UMA_EXE_POSTFIX_FLAGS) - ifndef j9vm_env_data64 - J9M31=-m31 + J9M31 = -m31 endif -UMA_EXE_PREFIX_FLAGS+=$(J9M31) +UMA_EXE_PREFIX_FLAGS += $(J9M31) ifndef UMA_DO_NOT_OPTIMIZE_CCODE -<#if uma.spec.properties.uma_optimization_cflags.defined> - UMA_OPTIMIZATION_CFLAGS+=${uma.spec.properties.uma_optimization_cflags.value} -<#else> - UMA_OPTIMIZATION_CFLAGS+=-O3 -march=z10 -mtune=z9-109 - -<#if uma.spec.properties.uma_optimization_cxxflags.defined> - UMA_OPTIMIZATION_CXXFLAGS+=${uma.spec.properties.uma_optimization_cxxflags.value} -<#else> - UMA_OPTIMIZATION_CXXFLAGS+=-O3 -march=z10 -mtune=z9-109 - + <#if uma.spec.properties.uma_optimization_cflags.defined> + UMA_OPTIMIZATION_CFLAGS += ${uma.spec.properties.uma_optimization_cflags.value} + <#else> + UMA_OPTIMIZATION_CFLAGS += -O3 -march=z10 -mtune=z9-109 + + <#if uma.spec.properties.uma_optimization_cxxflags.defined> + UMA_OPTIMIZATION_CXXFLAGS += ${uma.spec.properties.uma_optimization_cxxflags.value} + <#else> + UMA_OPTIMIZATION_CXXFLAGS += -O3 -march=z10 -mtune=z9-109 + else - UMA_OPTIMIZATION_CFLAGS+=-O0 - UMA_OPTIMIZATION_CXXFLAGS+=-O0 + UMA_OPTIMIZATION_CFLAGS += -O0 + UMA_OPTIMIZATION_CXXFLAGS += -O0 endif +CFLAGS += $(UMA_OPTIMIZATION_CFLAGS) +CXXFLAGS += $(UMA_OPTIMIZATION_CXXFLAGS) -CFLAGS+=$(UMA_OPTIMIZATION_CFLAGS) -CXXFLAGS+=$(UMA_OPTIMIZATION_CXXFLAGS) - -CXXFLAGS+=-fno-exceptions -fno-rtti -fno-threadsafe-statics +CXXFLAGS += -fno-exceptions -fno-rtti -fno-threadsafe-statics <#if uma.spec.processor.s390> -ifndef j9vm_env_data64 -ASFLAGS+= -mzarch -endif -ASFLAGS+= -march=z10 $(J9M31) $(VMASMDEBUG) -o $*.o + ifndef j9vm_env_data64 + ASFLAGS += -mzarch + endif + ASFLAGS += -march=z10 $(J9M31) $(VMASMDEBUG) -o $*.o ifdef j9vm_uma_gnuDebugSymbols -CFLAGS+=-g -CXXFLAGS+=-g + CFLAGS += -g + CXXFLAGS += -g endif -CFLAGS+=-DLINUX -D_REENTRANT -#-D_FILE_OFFSET_BITS=64 -CXXFLAGS+=-DLINUX -D_REENTRANT -#-D_FILE_OFFSET_BITS=64 -CPPFLAGS+=-DLINUX -D_REENTRANT +CFLAGS += -DLINUX -D_REENTRANT +# -D_FILE_OFFSET_BITS=64 +CXXFLAGS += -DLINUX -D_REENTRANT +# -D_FILE_OFFSET_BITS=64 +CPPFLAGS += -DLINUX -D_REENTRANT <#-- Add Position Independent compile flag --> -CFLAGS+=-fPIC -CXXFLAGS+=-fPIC +CFLAGS += -fPIC +CXXFLAGS += -fPIC ifdef j9vm_uma_supportsIpv6 - CFLAGS+= - CXXFLAGS+= - CPPFLAGS+= + CFLAGS += + CXXFLAGS += + CPPFLAGS += endif -CFLAGS+=$(J9M31) -DS390 -D_LONG_LONG -DJ9VM_TIERED_CODE_CACHE -fno-strict-aliasing -CXXFLAGS+=$(J9M31) -DS390 -D_LONG_LONG -DJ9VM_TIERED_CODE_CACHE -fno-strict-aliasing -CPPFLAGS+=-DS390 -D_LONG_LONG -DJ9VM_TIERED_CODE_CACHE +CFLAGS += $(J9M31) -DS390 -D_LONG_LONG -DJ9VM_TIERED_CODE_CACHE -fno-strict-aliasing +CXXFLAGS += $(J9M31) -DS390 -D_LONG_LONG -DJ9VM_TIERED_CODE_CACHE -fno-strict-aliasing +CPPFLAGS += -DS390 -D_LONG_LONG -DJ9VM_TIERED_CODE_CACHE ifdef j9vm_env_data64 - CFLAGS+=-DS39064 - CXXFLAGS+=-DS39064 - CPPFLAGS+=-DS39064 + CFLAGS += -DS39064 + CXXFLAGS += -DS39064 + CPPFLAGS += -DS39064 endif -UMA_DLL_LINK_FLAGS+=-shared +UMA_DLL_LINK_FLAGS += -shared ifdef UMA_USING_LD_TO_LINK - UMA_DLL_LINK_FLAGS+=-Map $(UMA_TARGET_NAME).map - UMA_DLL_LINK_FLAGS+=--version-script $(UMA_TARGET_NAME).exp - UMA_DLL_LINK_FLAGS+=-soname=$(UMA_DLLFILENAME) - UMA_DLL_LINK_FLAGS+=-z origin -rpath \$$ORIGIN -disable-new-dtags + UMA_DLL_LINK_FLAGS += -Map $(UMA_TARGET_NAME).map + UMA_DLL_LINK_FLAGS += --version-script $(UMA_TARGET_NAME).exp + UMA_DLL_LINK_FLAGS += -soname=$(UMA_DLLFILENAME) + UMA_DLL_LINK_FLAGS += -z origin -rpath \$$ORIGIN -disable-new-dtags else - UMA_DLL_LINK_FLAGS+=-Wl,-Map=$(UMA_TARGET_NAME).map - UMA_DLL_LINK_FLAGS+=-Wl,--version-script,$(UMA_TARGET_NAME).exp - UMA_DLL_LINK_FLAGS+=-Wl,-soname=$(UMA_DLLFILENAME) - UMA_DLL_LINK_FLAGS+=-Wl,--eh-frame-hdr - UMA_DLL_LINK_FLAGS+=-Wl,-script=/ztpf/commit/base/util/tools/tpfscript - UMA_DLL_LINK_FLAGS+=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN -Xlinker -disable-new-dtags + UMA_DLL_LINK_FLAGS += -Wl,-Map=$(UMA_TARGET_NAME).map + UMA_DLL_LINK_FLAGS += -Wl,--version-script,$(UMA_TARGET_NAME).exp + UMA_DLL_LINK_FLAGS += -Wl,-soname=$(UMA_DLLFILENAME) + UMA_DLL_LINK_FLAGS += -Wl,--eh-frame-hdr + UMA_DLL_LINK_FLAGS += -Wl,-script=/ztpf/commit/base/util/tools/tpfscript + UMA_DLL_LINK_FLAGS += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN -Xlinker -disable-new-dtags endif ifdef UMA_USING_LD_TO_LINK - UMA_DLL_LINK_POSTFLAGS+=--start-group + UMA_DLL_LINK_POSTFLAGS += --start-group else - UMA_DLL_LINK_POSTFLAGS+=-Xlinker --start-group + UMA_DLL_LINK_POSTFLAGS += -Xlinker --start-group endif -UMA_DLL_LINK_POSTFLAGS+=$(UMA_LINK_STATIC_LIBRARIES) +UMA_DLL_LINK_POSTFLAGS += $(UMA_LINK_STATIC_LIBRARIES) ifdef UMA_USING_LD_TO_LINK UMA_DLL_LINK_POSTFLAGS+=--end-group else - UMA_DLL_LINK_POSTFLAGS+=-Xlinker --end-group + UMA_DLL_LINK_POSTFLAGS += -Xlinker --end-group endif -UMA_DLL_LINK_POSTFLAGS+=$(UMA_LINK_SHARED_LIBRARIES) +UMA_DLL_LINK_POSTFLAGS += $(UMA_LINK_SHARED_LIBRARIES) ifdef j9vm_uma_gnuDebugSymbols -UMA_DLL_LINK_POSTFLAGS+=-g -endif - -UMA_DLL_LINK_POSTFLAGS+=-lCTOE -UMA_DLL_LINK_POSTFLAGS+=-lCISO -UMA_DLL_LINK_POSTFLAGS+=-lCIV1 -UMA_DLL_LINK_POSTFLAGS+=-lCLC1 -UMA_DLL_LINK_POSTFLAGS+=-lCTIS -UMA_DLL_LINK_POSTFLAGS+=-lCLBM -UMA_DLL_LINK_POSTFLAGS+=-lCTAL -UMA_DLL_LINK_POSTFLAGS+=-lCFVS -UMA_DLL_LINK_POSTFLAGS+=-lCTBX -UMA_DLL_LINK_POSTFLAGS+=-lCTXO -UMA_DLL_LINK_POSTFLAGS+=-lCTDF -UMA_DLL_LINK_POSTFLAGS+=-lCOMX -UMA_DLL_LINK_POSTFLAGS+=-lCOMS -UMA_DLL_LINK_POSTFLAGS+=-lCTHD + UMA_DLL_LINK_POSTFLAGS += -g +endif + +UMA_DLL_LINK_POSTFLAGS += -lCTOE +UMA_DLL_LINK_POSTFLAGS += -lCISO +UMA_DLL_LINK_POSTFLAGS += -lCIV1 +UMA_DLL_LINK_POSTFLAGS += -lCLC1 +UMA_DLL_LINK_POSTFLAGS += -lCTIS +UMA_DLL_LINK_POSTFLAGS += -lCLBM +UMA_DLL_LINK_POSTFLAGS += -lCTAL +UMA_DLL_LINK_POSTFLAGS += -lCFVS +UMA_DLL_LINK_POSTFLAGS += -lCTBX +UMA_DLL_LINK_POSTFLAGS += -lCTXO +UMA_DLL_LINK_POSTFLAGS += -lCTDF +UMA_DLL_LINK_POSTFLAGS += -lCOMX +UMA_DLL_LINK_POSTFLAGS += -lCOMS +UMA_DLL_LINK_POSTFLAGS += -lCTHD ifdef UMA_IS_C_PLUS_PLUS -UMA_DLL_LINK_POSTFLAGS+=-lCPP1 + UMA_DLL_LINK_POSTFLAGS += -lCPP1 endif -UMA_DLL_LINK_POSTFLAGS+=-lCTAD -UMA_DLL_LINK_POSTFLAGS+=-lTPFSTUB +UMA_DLL_LINK_POSTFLAGS += -lCTAD +UMA_DLL_LINK_POSTFLAGS += -lTPFSTUB -UMA_DLL_LINK_POSTFLAGS+=-Xlinker -z -Xlinker origin -UMA_DLL_LINK_POSTFLAGS+=-Xlinker -rpath -Xlinker \$$ORIGIN -Xlinker -disable-new-dtags -UMA_DLL_LINK_POSTFLAGS+=-Xlinker -rpath-link -Xlinker $(UMA_PATH_TO_ROOT) +UMA_DLL_LINK_POSTFLAGS += -Xlinker -z -Xlinker origin +UMA_DLL_LINK_POSTFLAGS += -Xlinker -rpath -Xlinker \$$ORIGIN -Xlinker -disable-new-dtags +UMA_DLL_LINK_POSTFLAGS += -Xlinker -rpath-link -Xlinker $(UMA_PATH_TO_ROOT) -UMA_EXE_POSTFIX_FLAGS+=-Wl,-Map -Wl,$(UMA_TARGET_NAME).map -UMA_EXE_POSTFIX_FLAGS+=-Wl,--as-needed -UMA_EXE_POSTFIX_FLAGS+=-Wl,--eh-frame-hdr -UMA_EXE_POSTFIX_FLAGS+=-Wl,-entry=0 -UMA_EXE_POSTFIX_FLAGS+=-Wl,-script=/ztpf/commit/base/util/tools/tpfscript +UMA_EXE_POSTFIX_FLAGS += -Wl,-Map -Wl,$(UMA_TARGET_NAME).map +UMA_EXE_POSTFIX_FLAGS += -Wl,--as-needed +UMA_EXE_POSTFIX_FLAGS += -Wl,--eh-frame-hdr +UMA_EXE_POSTFIX_FLAGS += -Wl,-entry=0 +UMA_EXE_POSTFIX_FLAGS += -Wl,-script=/ztpf/commit/base/util/tools/tpfscript ifdef j9vm_jit_32bitUses64bitRegisters - UMA_M4_FLAGS+=-DJ9VM_JIT_32BIT_USES64BIT_REGISTERS + UMA_M4_FLAGS += -DJ9VM_JIT_32BIT_USES64BIT_REGISTERS endif ifdef UMA_TREAT_WARNINGS_AS_ERRORS -ifndef UMA_SUPPRESS_WARNINGS_AS_ERRORS -CFLAGS+=-Wimplicit -Wreturn-type -Werror -CXXFLAGS+=-Wreturn-type -Werror -endif + ifndef UMA_SUPPRESS_WARNINGS_AS_ERRORS + CFLAGS += -Wimplicit -Wreturn-type -Werror + CXXFLAGS += -Wreturn-type -Werror + endif endif ifdef UMA_ENABLE_ALL_WARNINGS -ifndef UMA_SUPPRESS_ALL_WARNINGS -CFLAGS+=-Wall -CXXFLAGS+=-Wall -Wno-non-virtual-dtor -endif + ifndef UMA_SUPPRESS_ALL_WARNINGS + CFLAGS += -Wall + CXXFLAGS += -Wall -Wno-non-virtual-dtor + endif endif -UMA_DOT_EXE=.so -UMA_DOT_I=.i -UMA_DOT_II=.ii +UMA_DOT_EXE = .so +UMA_DOT_I = .i +UMA_DOT_II = .ii diff --git a/runtime/rasdump/module.xml b/runtime/rasdump/module.xml index 82f4d0ac15d..9794e449557 100644 --- a/runtime/rasdump/module.xml +++ b/runtime/rasdump/module.xml @@ -1,29 +1,26 @@ - - - @@ -43,10 +40,10 @@ - + - + @@ -71,7 +68,7 @@ - + diff --git a/runtime/runtimetools/balloon/module.xml b/runtime/runtimetools/balloon/module.xml index e569fb2b139..7a931b61041 100644 --- a/runtime/runtimetools/balloon/module.xml +++ b/runtime/runtimetools/balloon/module.xml @@ -1,27 +1,25 @@ - - @@ -40,17 +38,17 @@ - + - + - + diff --git a/runtime/runtimetools/javacoregen/module.xml b/runtime/runtimetools/javacoregen/module.xml index d308fac8cce..8e22464b27d 100644 --- a/runtime/runtimetools/javacoregen/module.xml +++ b/runtime/runtimetools/javacoregen/module.xml @@ -1,27 +1,25 @@ - - @@ -45,11 +43,11 @@ - + - + diff --git a/runtime/runtimetools/jlm/module.xml b/runtime/runtimetools/jlm/module.xml index 973bdb1df3e..c8ed694b50c 100644 --- a/runtime/runtimetools/jlm/module.xml +++ b/runtime/runtimetools/jlm/module.xml @@ -1,27 +1,25 @@ - - @@ -45,11 +43,11 @@ - + - + diff --git a/runtime/runtimetools/memorywatcher/module.xml b/runtime/runtimetools/memorywatcher/module.xml index c5d3a3d7345..2107d0ebc3f 100644 --- a/runtime/runtimetools/memorywatcher/module.xml +++ b/runtime/runtimetools/memorywatcher/module.xml @@ -1,27 +1,25 @@ - - @@ -40,17 +38,17 @@ - + - + - + diff --git a/runtime/runtimetools/migration/module.xml b/runtime/runtimetools/migration/module.xml index b76790a7b97..37b596c8327 100644 --- a/runtime/runtimetools/migration/module.xml +++ b/runtime/runtimetools/migration/module.xml @@ -1,27 +1,25 @@ - - @@ -40,17 +38,17 @@ - + - + - + diff --git a/runtime/runtimetools/osmemory/module.xml b/runtime/runtimetools/osmemory/module.xml index 7faaca41f8a..0122a289947 100644 --- a/runtime/runtimetools/osmemory/module.xml +++ b/runtime/runtimetools/osmemory/module.xml @@ -1,27 +1,25 @@ - - @@ -40,17 +38,17 @@ - + - + - + diff --git a/runtime/runtimetools/softmxtest/module.xml b/runtime/runtimetools/softmxtest/module.xml index 5db4da21478..c39d631119d 100644 --- a/runtime/runtimetools/softmxtest/module.xml +++ b/runtime/runtimetools/softmxtest/module.xml @@ -1,27 +1,25 @@ - - @@ -40,7 +38,7 @@ - + @@ -48,11 +46,11 @@ - + - + diff --git a/runtime/runtimetools/vmruntimestateagent/module.xml b/runtime/runtimetools/vmruntimestateagent/module.xml index 5a39ea3cba2..24d1e54e3f6 100755 --- a/runtime/runtimetools/vmruntimestateagent/module.xml +++ b/runtime/runtimetools/vmruntimestateagent/module.xml @@ -1,27 +1,25 @@ - - diff --git a/runtime/shared/module.xml b/runtime/shared/module.xml index e864468dc0f..6b99228dd12 100644 --- a/runtime/shared/module.xml +++ b/runtime/shared/module.xml @@ -1,29 +1,27 @@ - - - + @@ -47,17 +45,17 @@ - + - + - + @@ -67,5 +65,5 @@ - + diff --git a/runtime/tests/bcverify/unit/module.xml b/runtime/tests/bcverify/unit/module.xml index f4909a39041..28e8b31c4e7 100644 --- a/runtime/tests/bcverify/unit/module.xml +++ b/runtime/tests/bcverify/unit/module.xml @@ -1,29 +1,26 @@ - - - @@ -45,7 +42,7 @@ - + @@ -53,4 +50,4 @@ - \ No newline at end of file + diff --git a/runtime/tests/shared/module.xml b/runtime/tests/shared/module.xml index 9e5df1c52cd..7f6dc56f5e2 100644 --- a/runtime/tests/shared/module.xml +++ b/runtime/tests/shared/module.xml @@ -1,27 +1,25 @@ - - @@ -53,7 +51,7 @@ - + diff --git a/runtime/tests/vm_lifecycle/module.xml b/runtime/tests/vm_lifecycle/module.xml index eac36cb0c65..a9a99d72583 100644 --- a/runtime/tests/vm_lifecycle/module.xml +++ b/runtime/tests/vm_lifecycle/module.xml @@ -1,27 +1,25 @@ - - @@ -46,7 +44,7 @@ - + diff --git a/runtime/verbose/module.xml b/runtime/verbose/module.xml index 72cd3bb6b7f..3af497f2600 100644 --- a/runtime/verbose/module.xml +++ b/runtime/verbose/module.xml @@ -1,24 +1,24 @@