Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
cb6ee37
Removed double /0 on buffer in vsprintf. This should close issue #208
afxgroup Nov 30, 2024
0531343
Added clib4.library.debug on make release
afxgroup Nov 30, 2024
fdfd3ef
Merge master to development (#227)
walkero-gr Dec 17, 2024
8e91cfb
Code improvements based on compiler warnings and cppcheck reports
walkero-gr Dec 17, 2024
ec85378
Removed some commented code
walkero-gr Dec 17, 2024
f6dd5c2
Reverted the clib4.h changes and changed the initial value in common_…
walkero-gr Dec 18, 2024
34c7e75
Merge pull request #228 from walkero-gr/code-improvements
afxgroup Dec 18, 2024
12e0050
Initial commit of splitting stubs.c into separate units and modifying…
3246251196 Dec 20, 2024
f85296b
All stubs file are prepended with "stubs_". libc.gmk should only be p…
3246251196 Dec 20, 2024
aae19f7
Further
3246251196 Dec 20, 2024
394331c
Fix problem with lingering pipes (spawnvpe). Fix problem with underte…
elfpipe Dec 20, 2024
ecc0625
Remove lint in spawnvpe.c.
elfpipe Dec 20, 2024
d763415
Further link removal and clarification before PR finalization (spawnv…
elfpipe Dec 22, 2024
9b92ae1
Free command string. Remove unnecessary strdup. Tidy up comments. (sp…
elfpipe Dec 22, 2024
e12b5c8
Fix spawnv.
elfpipe Dec 23, 2024
6221fd3
Merge pull request #233 from AmigaLabs/split_stubs
afxgroup Dec 23, 2024
d898e96
Merge branch 'development' into development
afxgroup Dec 23, 2024
40cf2e3
Merge pull request #232 from elfpipe/development
afxgroup Dec 23, 2024
df67bc9
Fixes for test programs. asin.cpp most probably needs a fix outside c…
afxgroup Dec 23, 2024
d46f9e6
Remove LOG.txt
3246251196 Dec 25, 2024
d6633e7
Added a script to check offset values for stubs
3246251196 Dec 25, 2024
28c49a7
Update check_offset.sh
3246251196 Dec 25, 2024
4070e31
Small functions definitions. Added some TCP flags. Merged latest wmem…
afxgroup Dec 29, 2024
ff207fd
Merge pull request #235 from AmigaLabs/check_offsets
afxgroup Dec 29, 2024
614399b
Added u_* types variants in sys/types.h file needed by some configure…
afxgroup Dec 31, 2024
f2f231b
Merge branch 'development' of github.com:afxgroup/clib2 into development
afxgroup Dec 31, 2024
e9ab04b
Fix spawnv.
elfpipe Jan 1, 2025
927f0df
Add extra stack to child in spawnvpe.
elfpipe Jan 2, 2025
3ed8b39
Merge pull request #237 from elfpipe/development
afxgroup Jan 2, 2025
b1bb4c8
puts can cause a deadlock because __funlockfile_r was called also ins…
afxgroup Jan 2, 2025
d01f39f
Merge remote-tracking branch 'origin/development' into development
afxgroup Jan 2, 2025
515db2d
Fix memory allocator.
elfpipe Jan 2, 2025
47b9ed8
Further fixes for memory allocator. Emulated realloc in all four memo…
elfpipe Jan 3, 2025
9c273b5
Suggested patch to include argv[0] in unix path semantics (qmake).
elfpipe Jan 4, 2025
d2b7bd7
Change debug output to use clib4 standard notation in wireshark alloc…
elfpipe Jan 4, 2025
24249e0
Merge branch 'AmigaLabs:development' into development
elfpipe Jan 4, 2025
caadb04
Fix for broken I/O on clib4 caused by old clib2 code was causing pthr…
afxgroup Jan 4, 2025
cee3f5b
Wrong clib4 mismatch version in crtbegin.c
afxgroup Jan 4, 2025
4e63830
Added pthread_join_io.c to test correct STDOUT behaviour
afxgroup Jan 4, 2025
fbd343c
Better remove minor version from requirements since this can cause mi…
afxgroup Jan 5, 2025
79f9110
Changed 0x80000000 to 0x10000000 to handle signed int status variable…
afxgroup Jan 5, 2025
e2d160a
Replaced AllocVecTags/FreeVec with malloc/free where possible
afxgroup Jan 5, 2025
d721549
pthread_create now use correct file streams (and added some tests bef…
afxgroup Jan 5, 2025
644961e
Added some debug on setitimer
afxgroup Jan 5, 2025
0d3fc09
Replaced AllocVecTags with with malloc in environment creation
afxgroup Jan 5, 2025
7c3f638
Merge pull request #238 from elfpipe/development
afxgroup Jan 5, 2025
5e93246
Merge branch 'development' of github.com:afxgroup/clib2 into development
afxgroup Jan 5, 2025
99710eb
Fixed small error
afxgroup Jan 5, 2025
51da737
Added MEMORY_DEBUG define to enable memory debug in memory allocator
afxgroup Jan 5, 2025
1bd867e
-Update debug output in several modules.
elfpipe Jan 5, 2025
b8af612
Fixed waitpid completely and utterly. It really got a good banging. I…
elfpipe Jan 6, 2025
3d5c117
Merge branch 'development' into development
afxgroup Jan 6, 2025
73a9efd
Merge pull request #239 from elfpipe/development
afxgroup Jan 6, 2025
928f4cb
Fix broken merge
afxgroup Jan 6, 2025
780a8e4
Make utimensat not fail on qmake install.
elfpipe Jan 6, 2025
48e57e5
Merge branch 'development' of https://github.com/elfpipe/clib4_spawnv…
elfpipe Jan 6, 2025
41cb880
If getservbyname, getservbyport or gethostbyname has no results try t…
afxgroup Jan 10, 2025
cdaa276
Small changes to gethostbyname example
afxgroup Jan 10, 2025
270a97e
Merge remote-tracking branch 'origin/development' into development
afxgroup Jan 10, 2025
6640c54
Fixed a BAD problem on AllocVecTags when allocating memory for IOB
afxgroup Jan 11, 2025
2f34113
Merge branch 'development' of https://github.com/elfpipe/clib4_spawnv…
elfpipe Jan 11, 2025
d2c3766
Added test for hints->ai_socktype == 0 in getaddrinfo.c (qt6).
elfpipe Jan 11, 2025
3c054e8
OLD Constructor call was missing PTHREAD_CONSTRUCTOR definition. Adde…
afxgroup Jan 12, 2025
fd41a96
makeEnvironment now use a memory pool to allocate items so memory is …
afxgroup Jan 12, 2025
7362b7e
Added some debug on some memory functions. If MEMORY_DEBUG is set to …
afxgroup Jan 12, 2025
3656289
Fixed IO memory leak caused by unfreed buffer memory in files. File b…
afxgroup Jan 13, 2025
4a2d88c
Some file buffers were allocated via AllocVec instead of AllocVecPooled.
afxgroup Jan 13, 2025
a005c1e
Merge pull request #240 from elfpipe/development
afxgroup Jan 13, 2025
dffaf90
README changes
afxgroup Jan 13, 2025
e1b3602
Fix stack size code in pthread_create.c
elfpipe Jan 13, 2025
c99e2c5
Merge branch 'development' of https://github.com/elfpipe/clib4_spawnv…
elfpipe Jan 13, 2025
75cb843
Merge pull request #242 from elfpipe/development
afxgroup Jan 14, 2025
0e1846f
Merge branch 'development' of https://github.com/AmigaLabs/clib4 into…
migthymax Jan 17, 2025
2608b35
Use sigmask to access signal bit, instead of <<
migthymax Jan 17, 2025
4bf6932
Improved/Commented test programs to better udnerstand expected behavior
migthymax Jan 17, 2025
3f51b66
Added Task name in debug message
migthymax Jan 17, 2025
cbc6d54
Added sigwaitinfo & sigtimedwait
migthymax Jan 17, 2025
b7126cd
Rearrange properties in clib4 to keep backwards compatibility
migthymax Jan 18, 2025
e6c2fad
Merge pull request #243 from migthymax/sigtimedwait
afxgroup Jan 19, 2025
18b6b04
Converted all line endings to LF (Linux)
josefwegner Jan 19, 2025
e257b21
Merge pull request #244 from josefwegner/convert_to_lf
afxgroup Jan 19, 2025
d0b9cb4
Changed the mergeMaster action to include discord notification
walkero-gr Jan 20, 2025
b07c9e9
added a dummy file
walkero-gr Jan 20, 2025
cdba5d0
Merge pull request #24 from walkero-gr/test-PR-notification-1
walkero-gr Jan 20, 2025
f0a4c0a
disabled builds and updated the announcement message
walkero-gr Jan 20, 2025
1d3afd5
Some change in dummy
walkero-gr Jan 20, 2025
84d11aa
Merge pull request #25 from walkero-gr/test-PR-notification-1
walkero-gr Jan 20, 2025
368c970
did a fix in the compare url
walkero-gr Jan 20, 2025
c57bb6e
disabled builds and updated the announcement message
walkero-gr Jan 20, 2025
07bb26b
did a fix in the compare url
walkero-gr Jan 20, 2025
73703bd
2nd dummy change
walkero-gr Jan 20, 2025
0121fd9
Merge pull request #26 from walkero-gr/test-PR-notification-1
walkero-gr Jan 20, 2025
5c79e26
Added the compare url as a second announcement
walkero-gr Jan 20, 2025
bda85ff
Added the compare url as a second announcement
walkero-gr Jan 20, 2025
4bb4bc4
3rd change
walkero-gr Jan 20, 2025
14a9120
Merge pull request #27 from walkero-gr/test-PR-notification-1
walkero-gr Jan 20, 2025
a76aeb6
Added own compare url
walkero-gr Jan 20, 2025
4908d0b
4th change
walkero-gr Jan 20, 2025
f1579a7
Merge pull request #28 from walkero-gr/test-PR-notification-1
walkero-gr Jan 20, 2025
99460ce
change the comparison url
walkero-gr Jan 20, 2025
c7f84eb
5th change
walkero-gr Jan 20, 2025
a1be92d
Merge pull request #29 from walkero-gr/test-PR-notification-1
walkero-gr Jan 20, 2025
366dcd0
merge messages into one notification
walkero-gr Jan 20, 2025
e146ba4
6th change
walkero-gr Jan 20, 2025
d44a468
Merge pull request #30 from walkero-gr/test-PR-notification-1
walkero-gr Jan 20, 2025
1c43ecf
The slice didn't work
walkero-gr Jan 20, 2025
75c2112
7th change
walkero-gr Jan 20, 2025
b08d8c7
Merge pull request #31 from walkero-gr/test-PR-notification-1
walkero-gr Jan 20, 2025
55ad209
Discord announcement on PR merge
walkero-gr Jan 20, 2025
d2fafb3
Merge pull request #245 from walkero-gr/set-dicord-announcements-on-PRs
afxgroup Jan 21, 2025
5c7f057
Removed uneeded call to flush
migthymax Jan 21, 2025
b984e80
Merge pull request #246 from migthymax/fix-double-flush
afxgroup Jan 21, 2025
778dcf3
More line endings changes (#247)
afxgroup Jan 21, 2025
43d61a6
Wrong Printf version requirement printing (#248)
afxgroup Jan 28, 2025
c1645e6
Modify the initial test of parameter validity in flock to embrace the…
elfpipe Feb 11, 2025
8bf0fc9
Fixed iconv problem on dcngettext. Added Amiga-1251 charset on iconv …
afxgroup Feb 11, 2025
ce8239c
Added dlopen example to test shared objects along rpath and soname (#…
afxgroup Feb 23, 2025
6bf1f58
Merge Afxgroup branch into development
afxgroup Feb 24, 2025
dbe27dd
Added static_assert on assert.h (#257)
afxgroup Feb 28, 2025
fb7a426
Reverted flock.c changes (#258)
afxgroup Feb 28, 2025
15ba19c
Changed back (again..) flock.c (#259)
afxgroup Feb 28, 2025
e5b38b5
Added NETBSD getvfsstat function amd missing blkcnt_t in sys/types.h …
afxgroup Mar 2, 2025
d9d79ea
__time_delay was not working if wasn't in main thread (#262)
afxgroup Mar 6, 2025
4e70858
tzset() reworked (#263)
afxgroup Mar 8, 2025
7c10879
Added baserel support to clib4 (#264)
afxgroup Mar 16, 2025
11a72d1
Moved constructors and destructors on libOpen (#265)
afxgroup Apr 11, 2025
41067a2
Implemented getpriority and setpriority (#266)
afxgroup Apr 13, 2025
9f20509
Implemented unixPathsEnabled (#267)
afxgroup Apr 28, 2025
fa56628
Fixing conflicts with master
walkero-gr Apr 28, 2025
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
196 changes: 196 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
# Generated by CLion for GNU
BasedOnStyle: LLVM

AccessModifierOffset: -2
AlwaysBreakAfterReturnType: TopLevel
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterClass: true
AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: false
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: true
BeforeCatch: true
BeforeElse: true
IndentBraces: true
SplitEmptyFunction: false
BreakBeforeBinaryOperators: All
BreakBeforeBraces: Custom
BreakBeforeTernaryOperators: true
ColumnLimit: 80
ConstructorInitializerIndentWidth: 2
ContinuationIndentWidth: 2
ForEachMacros: [
'FOR_ALL_BB_FN',
'FOR_ALL_EH_REGION',
'FOR_ALL_EH_REGION_AT',
'FOR_ALL_EH_REGION_FN',
'FOR_ALL_INHERITED_FIELDS',
'FOR_ALL_PREDICATES',
'FOR_BB_BETWEEN',
'FOR_BB_INSNS',
'FOR_BB_INSNS_REVERSE',
'FOR_BB_INSNS_REVERSE_SAFE',
'FOR_BB_INSNS_SAFE',
'FOR_BODY',
'FOR_COND',
'FOR_EACH_2XWIDER_MODE',
'FOR_EACH_ACTUAL_CHILD',
'FOR_EACH_AGGR_INIT_EXPR_ARG',
'FOR_EACH_ALIAS',
'FOR_EACH_ALLOCNO',
'FOR_EACH_ALLOCNO_CONFLICT',
'FOR_EACH_ALLOCNO_IN_ALLOCNO_SET',
'FOR_EACH_ALLOCNO_OBJECT',
'FOR_EACH_ARTIFICIAL_DEF',
'FOR_EACH_ARTIFICIAL_USE',
'FOR_EACH_BB',
'FOR_EACH_BB_FN',
'FOR_EACH_BB_IN_BITMAP',
'FOR_EACH_BB_IN_BITMAP_REV',
'FOR_EACH_BB_IN_REGION',
'FOR_EACH_BB_IN_SBITMAP',
'FOR_EACH_BB_REVERSE',
'FOR_EACH_BB_REVERSE_FN',
'FOR_EACH_BB_REVERSE_IN_REGION',
'FOR_EACH_BIT_IN_MINMAX_SET',
'FOR_EACH_BSI_IN_REVERSE',
'FOR_EACH_CALL_EXPR_ARG',
'FOR_EACH_CHILD',
'FOR_EACH_CLONE',
'FOR_EACH_CODE_MAPPING',
'FOR_EACH_COND_FN_PAIR',
'FOR_EACH_CONFLICT',
'FOR_EACH_CONST_CALL_EXPR_ARG',
'FOR_EACH_CONSTRUCTOR_ELT',
'FOR_EACH_CONSTRUCTOR_VALUE',
'FOR_EACH_COPY',
'FOR_EACH_DEF',
'FOR_EACH_DEFINED_FUNCTION',
'FOR_EACH_DEFINED_SYMBOL',
'FOR_EACH_DEFINED_VARIABLE',
'FOR_EACH_DEP',
'FOR_EACH_DEP_LINK',
'FOR_EACH_EDGE',
'FOR_EACH_ELEMENT',
'FOR_EACH_ELIM_GRAPH_PRED',
'FOR_EACH_ELIM_GRAPH_SUCC',
'FOR_EACH_EXPR',
'FOR_EACH_EXPR_1',
'FOR_EACH_EXPR_ID_IN_SET',
'FOR_EACH_FLOAT_OPERATOR',
'FOR_EACH_FP_TYPE',
'FOR_EACH_FUNCTION',
'FOREACH_FUNCTION_ARGS',
'FOREACH_FUNCTION_ARGS_PTR',
'FOR_EACH_FUNCTION_WITH_GIMPLE_BODY',
'FOR_EACH_GORI_EXPORT_NAME',
'FOR_EACH_GORI_IMPORT_NAME',
'FOR_EACH_HASH_TABLE_ELEMENT',
'FOR_EACH_HTAB_ELEMENT',
'FOR_EACH_IMM_USE_FAST',
'FOR_EACH_IMM_USE_ON_STMT',
'FOR_EACH_IMM_USE_SAFE',
'FOR_EACH_IMM_USE_STMT',
'FOR_EACH_INSN',
'FOR_EACH_INSN_1',
'FOR_EACH_INSN_DEF',
'FOR_EACH_INSN_EQ_USE',
'FOR_EACH_INSN_INFO_DEF',
'FOR_EACH_INSN_INFO_EQ_USE',
'FOR_EACH_INSN_INFO_MW',
'FOR_EACH_INSN_INFO_USE',
'FOR_EACH_INSN_USE',
'FOR_EACH_INT_OPERATOR',
'FOR_EACH_INT_TYPE',
'FOR_EACH_INV',
'FOR_EACH_LOAD_BROADCAST',
'FOR_EACH_LOAD_BROADCAST_IMM',
'FOR_EACH_LOCAL_DECL',
'FOR_EACH_LOG_LINK',
'FOR_EACH_LOOP',
'FOR_EACH_LOOP_BREAK',
'FOR_EACH_LOOP_FN',
'FOR_EACH_MODE',
'FOR_EACH_MODE_FROM',
'FOR_EACH_MODE_IN_CLASS',
'FOR_EACH_MODE_UNTIL',
'FOR_EACH_NEST_INFO',
'FOR_EACH_OBJECT',
'FOR_EACH_OBJECT_CONFLICT',
'FOR_EACH_OP',
'FOR_EACH_PARTITION_PAIR',
'FOR_EACH_PHI',
'FOR_EACH_PHI_ARG',
'FOR_EACH_PHI_OR_STMT_DEF',
'FOR_EACH_PHI_OR_STMT_USE',
'FOR_EACH_POP',
'FOR_EACH_PREF',
'FOR_EACH_REF',
'FOR_EACH_REFERENCED_VAR',
'FOR_EACH_REFERENCED_VAR_IN_BITMAP',
'FOR_EACH_REFERENCED_VAR_SAFE',
'FOR_EACH_REF_REV',
'FOR_EACH_REGNO',
'FOR_EACH_SCALAR',
'FOR_EACH_SIGNED_TYPE',
'FOR_EACH_SSA',
'FOR_EACH_SSA_DEF_OPERAND',
'FOR_EACH_SSA_MAYDEF_OPERAND',
'FOR_EACH_SSA_MUST_AND_MAY_DEF_OPERAND',
'FOR_EACH_SSA_MUSTDEF_OPERAND',
'FOR_EACH_SSA_NAME',
'FOR_EACH_SSA_TREE_OPERAND',
'FOR_EACH_SSA_USE_OPERAND',
'FOR_EACH_SSA_VDEF_OPERAND',
'FOR_EACH_STATIC_INITIALIZER',
'FOR_EACH_STATIC_VARIABLE',
'FOR_EACH_STMT_IN_REVERSE',
'FOR_EACH_SUBINSN',
'FOR_EACH_SUBRTX',
'FOR_EACH_SUBRTX_PTR',
'FOR_EACH_SUBRTX_VAR',
'FOR_EACH_SUCC',
'FOR_EACH_SUCC_1',
'FOR_EACH_SYMBOL',
'FOR_EACH_TYPE',
'FOR_EACH_UNSIGNED_TYPE',
'FOR_EACH_VALUE_ID_IN_SET',
'FOR_EACH_VARIABLE',
'FOR_EACH_VEC_ELT',
'FOR_EACH_VEC_ELT_FROM',
'FOR_EACH_VEC_ELT_REVERSE',
'FOR_EACH_VEC_SAFE_ELT',
'FOR_EACH_VEC_SAFE_ELT_REVERSE',
'FOR_EACH_WIDER_MODE',
'FOR_EXPR',
'FOR_INIT_STMT',
'FOR_SCOPE',
'EXECUTE_IF_SET_IN_BITMAP',
'EXECUTE_IF_AND_IN_BITMAP',
'EXECUTE_IF_AND_COMPL_IN_BITMAP',
'EXECUTE_IF_SET_IN_REG_SET',
'EXECUTE_IF_SET_IN_HARD_REG_SET',
'EXECUTE_IF_AND_COMPL_IN_REG_SET',
'EXECUTE_IF_AND_IN_REG_SET',
'EXECUTE_IF_SET_IN_SPARSESET'
]
IndentCaseLabels: false
NamespaceIndentation: None
PenaltyBreakBeforeFirstCallParameter: 100
PointerAlignment: Right
SortIncludes: false
SpaceAfterCStyleCast: true
SpaceBeforeParens: Always
SpacesBeforeTrailingComments: 1
UseTab: Always
AlignEscapedNewlines: Right
AlignTrailingComments: true
AllowShortFunctionsOnASingleLine: All
AlwaysBreakTemplateDeclarations: MultiLine
KeepEmptyLinesAtTheStartOfBlocks: false
Standard: Auto
2 changes: 1 addition & 1 deletion .github/workflows/mergeMainBranches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ jobs:
with:
discord_webhook: https://discord.com/api/webhooks/${{ secrets.DISCORD_ANNOUNCEMENTS_ID }}/${{ secrets.DISCORD_ANNOUNCEMENTS_TOKEN }}
title: "Deploy to ${{ github.event.pull_request.base.ref }}"
description: "Check it out at: ${{ github.event.pull_request.html_url }}"
description: "Check it out at: ${{ github.event.pull_request.html_url }}"
30 changes: 28 additions & 2 deletions GNUmakefile.os4
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ STRIP := ppc-amigaos-strip
RANLIB := ppc-amigaos-ranlib
HOST_CXX := g++
SDK_INCLUDE ?= $(abspath $(addsuffix ../ppc-amigaos/SDK/include/,$(dir $(shell which $(word 1,$(CC))))))
MAKELINK := ln -s

# On AmigaOS use native commands
ifeq ($(UNAME), AmigaOS)
Expand Down Expand Up @@ -72,7 +73,7 @@ WARNINGS := \
-Wundef -Wmissing-declarations -Wunused -Wwrite-strings -Wno-unused-value -Wno-comment -Wno-missing-braces \
-Wno-deprecated-declarations -Wno-sign-compare -Wno-unused-variable -Wno-parentheses -Wno-missing-prototypes \
-Wstrict-aliasing -Wno-shadow -Wno-discarded-qualifiers -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing \
-Wno-type-limits -Wno-cast-function-type -Wno-frame-address -Wno-error=unused-but-set-variable -Werror \
-Wno-type-limits -Wno-cast-function-type -Wno-frame-address -Wno-error=unused-but-set-variable -Wno-stringop-overflow -Werror \
# -Wbad-function-cast -Wconversion -Wformat

PIC := -fPIC -DPIC
Expand Down Expand Up @@ -200,6 +201,7 @@ include libprofile.gmk
prepare:
-$(MAKEDIR) $(BUILD_DIR)/shared
-$(MAKEDIR) $(INSTALL_PREFIX)/lib
-$(MAKEDIR) $(INSTALL_PREFIX)/lib/baserel
-$(MAKEDIR) $(INSTALL_PREFIX)/include
# It may be the case that this makefile is invoked with an explicit CC
# assingment such as: "gcc -B /someDir/". In fact, this pattern is used within
Expand All @@ -219,6 +221,7 @@ prepare:
ALL_TARGETS = \
$(OUTPUT_LIB)/crt0.o \
$(OUTPUT_LIB)/crtbegin.o \
$(OUTPUT_LIB)/baserel/crtbegin.o \
$(OUTPUT_LIB)/crtend.o \
$(OUTPUT_LIB)/shcrtbegin.o \
$(OUTPUT_LIB)/shcrtend.o \
Expand Down Expand Up @@ -276,7 +279,7 @@ version:
# Shared clib4.library rules

clib4.library.debug: $(OBJ_C_LIB)
$(VERBOSE)$(CC) -o $(BUILD_DIR)/$@ $(CFLAGS) $(BUILD_DIR)/shared/shared_library/clib4.o $(BUILD_DIR)/shared/shared_library/math.o $(OBJ_C_LIB) $(OUTPUT_LIB)/crtend.o $(DLIBS) -Wl,--cref,-M,-Map=$(BUILD_DIR)/$@.map
$(VERBOSE)$(CC) -o $(BUILD_DIR)/$@ $(CFLAGS) $(BUILD_DIR)/shared/shared_library/clib4.o $(BUILD_DIR)/shared/shared_library/math.o $(OBJ_C_LIB) $(OUTPUT_LIB)/crtend.o $(DLIBS) -Wl,-export-dynamic -Wl,--cref,-M,-Map=$(BUILD_DIR)/$@.map

clib4.library: clib4.library.debug
cp $(BUILD_DIR)/$< $(BUILD_DIR)/$@
Expand All @@ -303,6 +306,11 @@ $(OUTPUT_LIB)/crtbegin.o : $(LIB_DIR)/crtbegin.c
$(VERBOSE)$(COMPILE)
-$(COPY) $(OUTPUT_LIB)/crtbegin.o $(INSTALL_PREFIX)/lib/

$(OUTPUT_LIB)/baserel/crtbegin.o: CFLAGS = $(STABS) $(OPTIONS) $(INCLUDES) -O0 -fno-aggressive-loop-optimizations
$(OUTPUT_LIB)/baserel/crtbegin.o : $(LIB_DIR)/crtbegin.c
$(VERBOSE)$(COMPILE_BASEREL)
-$(COPY) $(OUTPUT_LIB)/baserel/crtbegin.o $(INSTALL_PREFIX)/lib/baserel/crtbegin.o

$(OUTPUT_LIB)/crtend.o : CFLAGS = -O0 $(OPTIONS) $(INCLUDES) -fno-aggressive-loop-optimizations
$(OUTPUT_LIB)/crtend.o : $(LIB_DIR)/crtend.c
$(VERBOSE)$(COMPILE)
Expand All @@ -326,6 +334,12 @@ $(VERBOSE)echo -e "\rCompiling Static \033[0;33m[$(@D)]\033[0m \r\t\t\t\t\t\t\t\
$(VERBOSE)$(CC) $(CFLAGS) -o $@ -c $< $(LOG_COMMAND)
endef

define COMPILE_BASEREL
$(VERBOSE)@$(MAKEDIR) $(@D)
$(VERBOSE)echo -e "\rCompiling Static Baserel \033[0;33m[$(@D)]\033[0m \r\t\t\t\t\t\t\t\t\t\t\t \033[0;31m$(@F)\033[0m"
$(VERBOSE)$(CC) $(CFLAGS) -DCLIB4_MBASEREL -o $@ -c $< $(LOG_COMMAND)
endef

define COMPILE_INLINE
$(VERBOSE)@$(MAKEDIR) $(@D)
$(VERBOSE)echo -e "\rCompiling Inline Static \033[0;33m[$(@D)]\033[0m \r\t\t\t\t\t\t\t\t\t\t\t \033[0;31m$(@F)\033[0m"
Expand Down Expand Up @@ -422,6 +436,16 @@ install:
$(DELETE) $(INSTALL_PREFIX)/lib/*
$(DELETE) $(INSTALL_PREFIX)/clib4.library*
$(COPY) $(OUTPUT_LIB)/* $(INSTALL_PREFIX)/lib/
$(MAKELINK) $(INSTALL_PREFIX)/lib/libamiga.a $(INSTALL_PREFIX)/lib/baserel/libamiga.a
$(MAKELINK) $(INSTALL_PREFIX)/lib/libauto.a $(INSTALL_PREFIX)/lib/baserel/libauto.a
$(MAKELINK) $(INSTALL_PREFIX)/lib/libc.a $(INSTALL_PREFIX)/lib/baserel/libc.a
$(MAKELINK) $(INSTALL_PREFIX)/lib/libcrypt.a $(INSTALL_PREFIX)/lib/baserel/libcrypt.a
$(MAKELINK) $(INSTALL_PREFIX)/lib/libdebug.a $(INSTALL_PREFIX)/lib/baserel/libdebug.a
$(MAKELINK) $(INSTALL_PREFIX)/lib/libm.a $(INSTALL_PREFIX)/lib/baserel/libm.a
$(MAKELINK) $(INSTALL_PREFIX)/lib/libprofile.a $(INSTALL_PREFIX)/lib/baserel/libprofile.a
$(MAKELINK) $(INSTALL_PREFIX)/lib/librt.a $(INSTALL_PREFIX)/lib/baserel/librt.a
$(MAKELINK) $(INSTALL_PREFIX)/lib/crt0.o $(INSTALL_PREFIX)/lib/baserel/crt0.o
$(MAKELINK) $(INSTALL_PREFIX)/lib/crtend.o $(INSTALL_PREFIX)/lib/baserel/crtend.o
$(COPY) libs/libauto.a $(INSTALL_PREFIX)/lib/
$(COPY) $(BUILD_DIR)/clib4.library* $(INSTALL_PREFIX)
$(COPY) $(LIB_ROOT)/library/include/* $(INSTALL_PREFIX)/include/
Expand All @@ -431,6 +455,7 @@ release:
-$(DELETE) clib4.info
-$(MAKEDIR) clib4/include
-$(MAKEDIR) clib4/lib
-$(MAKEDIR) clib4/lib/baserel
-$(COPY) *.md clib4/
-$(COPY) LICENSE* clib4/
-$(COPY) installer/Install* clib4/
Expand All @@ -441,6 +466,7 @@ release:
-$(COPY) misc clib4/
-$(COPY) libs/libauto.a clib4/lib/
-$(COPY) $(OUTPUT_LIB)/* clib4/lib/
-$(COPY) $(OUTPUT_LIB)/baserel/* clib4/lib/baserel/
-$(COPY) $(LIB_ROOT)/library/include/* clib4/include/
@lha -ao5i clib4.lha clib4 clib4.info
-$(DELETE) clib4
Expand Down
16 changes: 12 additions & 4 deletions libc.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ endif

C_BASE := \
libc_init_global.o \
debug/amigaos_symbols_callback.o \
getclib4.o \
errno_data.o

Expand Down Expand Up @@ -148,9 +149,13 @@ C_NL_TYPES := \
C_POSIX := \
posix/fnmatch.o \
posix/fstatvfs.o \
posix/getvfsstat.o \
posix/glob.o \
posix/globfree.o \
posix/basename.o \
debug/backtrace.o \
debug/backtrace_symbols.o \
debug/backtrace_symbols_fd.o \
posix/dirname.o \
posix/memalign.o \
posix/mmap.o \
Expand Down Expand Up @@ -204,7 +209,9 @@ C_POSIX := \
wait/waitpid.o \
posix/waitpoll.o \
posix/writev.o \
posix/uname.o
posix/uname.o \
posix/getpriority.o \
posix/setpriority.o

C_REGEX := \
regex/regcomp.o \
Expand Down Expand Up @@ -487,6 +494,7 @@ C_STDLIB := \
stdlib/calloc.o \
stdlib/div.o \
stdlib/divsi3.o \
stdlib/dladdr.o \
stdlib/dlclose.o \
stdlib/dlerror.o \
stdlib/dlopen.o \
Expand Down Expand Up @@ -523,6 +531,7 @@ C_STDLIB := \
stdlib/mprec.o \
stdlib/mulsi3.o \
stdlib/posix_memalign.o \
stdlib/processscan_hook_function.o \
stdlib/program_name.o \
stdlib/putenv.o \
stdlib/qsort.o \
Expand Down Expand Up @@ -591,17 +600,15 @@ C_STRING := \
cpu/generic/bcopy.o \
cpu/generic/strcat.o \
cpu/generic/strchr.o \
cpu/generic/strcpy.o \
cpu/generic/strcmp.o \
cpu/generic/strlen.o \
string/rindex.o \
string/stccpy.o \
string/stpcpy.o \
string/stpncpy.o \
string/strcasestr.o \
string/strcat.o \
string/strchr.o \
string/strchrnul.o \
string/strcmp.o \
string/strcoll.o \
string/strcpy.o \
string/strcspn.o \
Expand Down Expand Up @@ -782,6 +789,7 @@ C_UNISTD := \
unistd/ttyname.o \
unistd/ttyname_r.o \
unistd/ualarm.o \
unistd/unix_paths_enabled.o \
unistd/unlink.o \
unistd/usleep.o \
unistd/wildcard_expand.o
Expand Down
Loading
Loading