Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
68916bca
Commit
68916bca
authored
Mar 07, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
workaround for xtradb on gcc 4.1.2 RHEL5/x86, gcc atomic ops only work under -march=i686
parent
a5fdd759
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
storage/innobase/CMakeLists.txt
storage/innobase/CMakeLists.txt
+6
-0
storage/xtradb/CMakeLists.txt
storage/xtradb/CMakeLists.txt
+6
-0
No files found.
storage/innobase/CMakeLists.txt
View file @
68916bca
...
...
@@ -59,6 +59,12 @@ CHECK_FUNCTION_EXISTS(sched_getcpu HAVE_SCHED_GETCPU)
IF
(
NOT MSVC
)
# either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
IF
(
NOT CMAKE_CROSSCOMPILING
)
# workaround for gcc 4.1.2 RHEL5/x86, gcc atomic ops only work under -march=i686
IF
(
CMAKE_SYSTEM_PROCESSOR STREQUAL
"i686"
AND CMAKE_COMPILER_IS_GNUCC AND
CMAKE_C_COMPILER_VERSION VERSION_LESS
"4.1.3"
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-march=i686"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-march=i686"
)
ENDIF
()
CHECK_C_SOURCE_RUNS
(
"
int main()
...
...
storage/xtradb/CMakeLists.txt
View file @
68916bca
...
...
@@ -65,6 +65,12 @@ CHECK_FUNCTION_EXISTS(sched_getcpu HAVE_SCHED_GETCPU)
IF
(
NOT MSVC
)
# either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
IF
(
NOT CMAKE_CROSSCOMPILING
)
# workaround for gcc 4.1.2 RHEL5/x86, gcc atomic ops only work under -march=i686
IF
(
CMAKE_SYSTEM_PROCESSOR STREQUAL
"i686"
AND CMAKE_COMPILER_IS_GNUCC AND
CMAKE_C_COMPILER_VERSION VERSION_LESS
"4.1.3"
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-march=i686"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-march=i686"
)
ENDIF
()
CHECK_C_SOURCE_RUNS
(
"
int main()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment