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

Removed definition flag in C options that was -D__CLIB2__. This is no… #151

Merged
merged 1 commit into from
Oct 20, 2023
Merged

Removed definition flag in C options that was -D__CLIB2__. This is no… #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 GNUmakefile.os4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ SHARED := $(if $(SHARED),$(SHARED),yes)
STATIC := $(if $(STATIC),$(STATIC),yes)

LARGEDATA :=
OPTIONS += $(LARGEDATA) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__CLIB2__ -Wa,-mregnames -fno-builtin -nostdlib -D_GNU_SOURCE -D_XOPEN_SOURCE -D_USE_GNU -pipe
OPTIONS += $(LARGEDATA) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wa,-mregnames -fno-builtin -nostdlib -D_GNU_SOURCE -D_XOPEN_SOURCE -D_USE_GNU -pipe
OPTIMIZE := -O3 -mregnames -mmultiple -mupdate -ffp-contract=fast -mstrict-align

STABS :=
Expand Down
4 changes: 2 additions & 2 deletions library/shared_library/interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@ struct Clib4IFace {
/* sys/utsname.h */
int (* uname) (struct utsname *); /* 4084 */

/* END OF CLIB2 VERSION 1.0 */
/* END OF CLIB4 VERSION 1.0 */
/* New function will go below */

int (* futimens) (int fd, const struct timespec times[2]); /* 4098 */
Expand Down Expand Up @@ -1345,4 +1345,4 @@ struct Clib4IFace {

#define Clib4Call(x...) Clib4Call2(x)

#endif
#endif
2 changes: 1 addition & 1 deletion library/shared_library/stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@ Clib4Call(times, 4072);
Clib4Call(readv, 4076);
Clib4Call(writev, 4080);
Clib4Call(uname, 4084);
/* END OF CLIB2 VERSION 1.0 */
/* END OF CLIB4 VERSION 1.0 */
/* New function will go below */
Clib4Call(futimens, 4088);
Clib4Call(utimensat, 4092);
Expand Down
4 changes: 2 additions & 2 deletions test_programs/misc/md5sum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include <string.h>
#include <stdint.h>
#include <time.h>
#ifdef __CLIB2__
#ifdef __CLIB4__
#include <endian.h>
#else
#include <machine/endian.h>
Expand Down Expand Up @@ -1124,4 +1124,4 @@ int main(int argc, char **argv) {
return EXIT_SUCCESS;
else
return EXIT_FAILURE;
}
}
Loading