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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
f08eb5cf
Commit
f08eb5cf
authored
May 20, 2014
by
Leif Walsh
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #245 from Tokutek/gcc-4.9-support
Support gcc 4.9 in cmake, fix uninitialized value warnings
parents
6658f899
bfe318a4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
3 deletions
+28
-3
CMakeLists.txt
CMakeLists.txt
+25
-0
ft/log_upgrade.cc
ft/log_upgrade.cc
+2
-2
ft/logger.cc
ft/logger.cc
+1
-1
No files found.
CMakeLists.txt
View file @
f08eb5cf
...
...
@@ -7,6 +7,31 @@ project(TokuDB)
set
(
CMAKE_SHARED_LIBRARY_LINK_C_FLAGS
""
)
set
(
CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS
""
)
## Versions of gcc >= 4.9.0 require special version of 'ar' and 'ranlib' for
## link-time optimizations to work properly.
##
## From https://gcc.gnu.org/gcc-4.9/changes.html:
##
## When using a linker plugin, compiling with the -flto option now
## generates slim objects files (.o) which only contain intermediate
## language representation for LTO. Use -ffat-lto-objects to create
## files which contain additionally the object code. To generate
## static libraries suitable for LTO processing, use gcc-ar and
## gcc-ranlib; to list symbols from a slim object file use
## gcc-nm. (Requires that ar, ranlib and nm have been compiled with
## plugin support.)
if
((
CMAKE_CXX_COMPILER_ID STREQUAL GNU
)
AND
NOT
(
CMAKE_CXX_COMPILER_VERSION VERSION_LESS
"4.9.0"
))
find_program
(
gcc_ar
"gcc-ar"
)
if
(
gcc_ar
)
set
(
CMAKE_AR
"
${
gcc_ar
}
"
)
endif
()
find_program
(
gcc_ranlib
"gcc-ranlib"
)
if
(
gcc_ranlib
)
set
(
CMAKE_RANLIB
"
${
gcc_ranlib
}
"
)
endif
()
endif
()
include
(
TokuFeatureDetection
)
include
(
TokuSetupCompiler
)
include
(
TokuSetupCTest
)
...
...
ft/log_upgrade.cc
View file @
f08eb5cf
...
...
@@ -321,8 +321,8 @@ toku_maybe_upgrade_log(const char *env_dir, const char *log_dir, LSN * lsn_of_cl
r
=
0
;
//Logs are up to date
else
{
FOOTPRINT
(
4
);
LSN
last_lsn
;
TXNID
last_xid
;
LSN
last_lsn
=
ZERO_LSN
;
TXNID
last_xid
=
TXNID_NONE
;
r
=
verify_clean_shutdown_of_log_version
(
log_dir
,
version_of_logs_on_disk
,
&
last_lsn
,
&
last_xid
);
if
(
r
!=
0
)
{
goto
cleanup
;
...
...
ft/logger.cc
View file @
f08eb5cf
...
...
@@ -621,7 +621,7 @@ int toku_logger_find_next_unused_log_file(const char *directory, long long *resu
if
(
d
==
0
)
return
get_error_errno
();
while
((
de
=
readdir
(
d
)))
{
if
(
de
==
0
)
return
get_error_errno
();
long
long
thisl
;
long
long
thisl
=
-
1
;
if
(
is_a_logfile
(
de
->
d_name
,
&
thisl
)
)
{
if
((
long
long
)
thisl
>
maxf
)
maxf
=
thisl
;
}
...
...
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