Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PPC - remove -mlong-double-64 flag and use the default #6933

Merged
merged 6 commits into from
Jun 3, 2021
Merged

PPC - remove -mlong-double-64 flag and use the default #6933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b46b26
Update ppc build flags and rpm macro
mrodozov May 29, 2021
86d4ca7
remove one flag in common flags and bring the old name
mrodozov May 31, 2021
13643be
bring the ppc64le_build_flags instead of ld64
mrodozov May 31, 2021
2757e79
formatting
mrodozov May 31, 2021
ed293b8
add the include for compilation flags
mrodozov May 31, 2021
bbde15b
revert the openblas change
mrodozov Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compilation_flags.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%if "%{?ppc64le_build_flags:set}" != "set"
%define ppc64le_build_flags -mlong-double-64 -mcpu=power8 -mtune=power8 --param=l1-cache-size=64 --param=l1-cache-line-size=128 --param=l2-cache-size=512
%define ppc64le_build_flags -mcpu=powerpc64le -mtune=power8 --param=l1-cache-size=64 --param=l1-cache-line-size=128 --param=l2-cache-size=512
%endif

3 changes: 2 additions & 1 deletion fftjet.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
### RPM external fftjet 1.5.0
## INCLUDE compilation_flags
Source: http://www.hepforge.org/archive/fftjet/%n-%realversion.tar.gz
Requires: fftw3

Expand All @@ -25,7 +26,7 @@ touch pkg-config ; chmod +x pkg-config
./configure $PLATF_CONF_OPTS --disable-dependency-tracking --enable-threads \
--prefix=%i F77="$F77" CXX="$CXX" DEPS_CFLAGS=-I$FFTW3_ROOT/include \
%ifarch ppc64le
CXXFLAGS="-O2 -mlong-double-64" \
CXXFLAGS="-O2 %{ppc64le_build_flags}" \
%else
CXXFLAGS="-O2" \
%endif
Expand Down
4 changes: 2 additions & 2 deletions fmt.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### RPM external fmt 7.0.1

## INCLUDE compilation_flags
Source: https://github.com/fmtlib/fmt/archive/%{realversion}.tar.gz
BuildRequires: gmake cmake

Expand All @@ -15,7 +15,7 @@ cmake ../%{n}-%{realversion} \
-DCMAKE_INSTALL_PREFIX:STRING=%{i} \
-DCMAKE_INSTALL_LIBDIR:STRING=lib \
%ifarch ppc64le
-DCMAKE_CXX_FLAGS="-mlong-double-64" \
-DCMAKE_CXX_FLAGS="%{ppc64le_build_flags}" \
%endif
-DBUILD_SHARED_LIBS=TRUE

Expand Down
7 changes: 4 additions & 3 deletions geant4.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
### RPM external geant4 10.7.1
## INCLUDE compilation_flags
%define tag %{realversion}
%define branch geant4-10.7-release
%define github_user Geant4
Expand Down Expand Up @@ -32,9 +33,9 @@ export VecGeom_DIR=${VECGEOM_ROOT}/lib/cmake/VecGeom
cmake ../%{n}.%{realversion} \
-DCMAKE_CXX_COMPILER="g++" \
%ifarch ppc64le
-DCMAKE_CXX_FLAGS="-fPIC -mlong-double-64" \
-DCMAKE_STATIC_LIBRARY_CXX_FLAGS="-fPIC -mlong-double-64" \
-DCMAKE_STATIC_LIBRARY_C_FLAGS="-fPIC -mlong-double-64" \
-DCMAKE_CXX_FLAGS="-fPIC %{ppc64le_build_flags}" \
-DCMAKE_STATIC_LIBRARY_CXX_FLAGS="-fPIC %{ppc64le_build_flags}" \
-DCMAKE_STATIC_LIBRARY_C_FLAGS="-fPIC %{ppc64le_build_flags}" \
%else
-DCMAKE_CXX_FLAGS="-fPIC" \
-DCMAKE_STATIC_LIBRARY_CXX_FLAGS="-fPIC" \
Expand Down
1 change: 0 additions & 1 deletion llvm-gcc-toolfile.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/llvm-cxxcompiler.xml
<flags REM_CXXFLAGS="-mrecip"/>
<flags REM_CXXFLAGS="-fno-crossjumping"/>
<flags REM_CXXFLAGS="-fno-aggressive-loop-optimizations"/>
<flags REM_CXXFLAGS="-mlong-double-64"/>
<flags REM_CXXFLAGS="-funroll-all-loops"/>
<flags CXXFLAGS="-Wno-c99-extensions"/>
<flags CXXFLAGS="-Wno-c++11-narrowing"/>
Expand Down