Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
relibc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
relibc
Commits
66f1f32a
Verified
Commit
66f1f32a
authored
1 year ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Pad RlctAttr for 32-bit systems
parent
64849c7d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#12160
failed
1 year ago
Stage: build
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/header/bits_pthread/mod.rs
+2
-2
2 additions, 2 deletions
src/header/bits_pthread/mod.rs
src/header/pthread/attr.rs
+3
-1
3 additions, 1 deletion
src/header/pthread/attr.rs
src/header/pthread/mod.rs
+2
-0
2 additions, 0 deletions
src/header/pthread/mod.rs
with
7 additions
and
3 deletions
src/header/bits_pthread/mod.rs
+
2
−
2
View file @
66f1f32a
...
...
@@ -16,7 +16,7 @@ use core::sync::atomic::{AtomicU32 as AtomicUint, AtomicI32 as AtomicInt};
#[repr(C)]
pub
union
pthread_attr_t
{
__relibc_internal_size
:
[
c_uchar
;
32
],
__relibc_internal_align
:
c_long
,
__relibc_internal_align
:
size_t
,
}
#[repr(C)]
pub
union
pthread_rwlockattr_t
{
...
...
@@ -88,7 +88,7 @@ macro_rules! assert_equal_size(
#[cfg(all(target_os
=
"redox"
,
feature
=
"check_against_libc_crate"
))]
const
_
:
()
=
unsafe
{
let
export
=
$export
{
__relibc_internal_align
:
0
};
let
_
:
libc
::
$export
=
core
::
mem
::
transmute
(
export
.__relibc_internal_size
);
let
_
:
libc
::
$export
=
core
::
mem
::
transmute
(
export
.__relibc_internal_size
);
let
a
=
[
0_u8
;
core
::
mem
::
align_of
::
<
$export
>
()];
let
b
:
[
u8
;
core
::
mem
::
align_of
::
<
libc
::
$export
>
()]
=
core
::
mem
::
transmute
(
a
);
...
...
This diff is collapsed.
Click to expand it.
src/header/pthread/attr.rs
+
3
−
1
View file @
66f1f32a
...
...
@@ -22,7 +22,9 @@ impl Default for RlctAttr {
param
:
sched_param
{
// TODO
sched_priority
:
0
,
}
},
#[cfg(target_pointer_width
=
"32"
)]
_pad
:
[
0
;
12
],
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/header/pthread/mod.rs
+
2
−
0
View file @
66f1f32a
...
...
@@ -24,6 +24,8 @@ pub(crate) struct RlctAttr {
pub
stacksize
:
size_t
,
pub
stack
:
size_t
,
pub
param
:
sched_param
,
#[cfg(target_pointer_width
=
"32"
)]
_pad
:
[
u8
;
12
],
}
pub
const
PTHREAD_BARRIER_SERIAL_THREAD
:
c_int
=
-
1
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment