diff --git a/.cproject b/.cproject index 8dc6d4d..94e0050 100644 --- a/.cproject +++ b/.cproject @@ -5,37 +5,37 @@ - + - - + + - + - - - - - - + + + + + - - + + + - - - + + + + + + - - - @@ -46,10 +46,38 @@ + + + + + + + + + + + make + + UbixOS + true + false + true + + + + + + + + + + + + + + + - - - diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e63ddd8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/Default/ diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index fbcecf6..0120f53 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/.settings/org.eclipse.cdt.codan.core.prefs b/.settings/org.eclipse.cdt.codan.core.prefs new file mode 100644 index 0000000..812e407 --- /dev/null +++ b/.settings/org.eclipse.cdt.codan.core.prefs @@ -0,0 +1,71 @@ +eclipse.preferences.version=1 +org.eclipse.cdt.codan.checkers.errnoreturn=Warning +org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return\\")",implicit\=>false} +org.eclipse.cdt.codan.checkers.errreturnvalue=Error +org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused return value\\")"} +org.eclipse.cdt.codan.checkers.nocommentinside=-Error +org.eclipse.cdt.codan.checkers.nocommentinside.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Nesting comments\\")"} +org.eclipse.cdt.codan.checkers.nolinecomment=-Error +org.eclipse.cdt.codan.checkers.nolinecomment.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Line comments\\")"} +org.eclipse.cdt.codan.checkers.noreturn=Error +org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return value\\")",implicit\=>false} +org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error +org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Abstract class cannot be instantiated\\")"} +org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error +org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Ambiguous problem\\")"} +org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning +org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment in condition\\")"} +org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error +org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment to itself\\")"} +org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning +org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No break at end of case\\")",no_break_comment\=>"no break",last_case_param\=>false,empty_case_param\=>false,enable_fallthrough_quickfix_param\=>false} +org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning +org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Catching by reference is recommended\\")",unknown\=>false,exceptions\=>()} +org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error +org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Circular inheritance\\")"} +org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=Warning +org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class members should be properly initialized\\")",skip\=>true} +org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error +org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Field cannot be resolved\\")"} +org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error +org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Function cannot be resolved\\")"} +org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error +org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid arguments\\")"} +org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error +org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid template argument\\")"} +org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error +org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Label statement not found\\")"} +org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error +org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Member declaration not found\\")"} +org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error +org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Method cannot be resolved\\")"} +org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info +org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Name convention for function\\")",pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} +org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning +org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class has a virtual method and non-virtual destructor\\")"} +org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error +org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid overload\\")"} +org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error +org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redeclaration\\")"} +org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error +org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redefinition\\")"} +org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning +org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Return with parenthesis\\")"} +org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning +org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Format String Vulnerability\\")"} +org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning +org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Statement has no effect\\")",macro\=>true,exceptions\=>()} +org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning +org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suggested parenthesis around expression\\")",paramNot\=>false} +org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning +org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suspicious semicolon\\")",else\=>false,afterelse\=>false} +org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error +org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Type cannot be resolved\\")"} +org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning +org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused function declaration\\")",macro\=>true} +org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning +org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused static function\\")",macro\=>true} +org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning +org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused variable declaration in file scope\\")",macro\=>true,exceptions\=>("@(\#)","$Id")} +org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error +org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Symbol is not resolved\\")"} diff --git a/.settings/org.eclipse.cdt.core.prefs b/.settings/org.eclipse.cdt.core.prefs new file mode 100644 index 0000000..04b7e71 --- /dev/null +++ b/.settings/org.eclipse.cdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +environment/project/cdt.managedbuild.toolchain.gnu.base.1467187978/CWD/delimiter=; +environment/project/cdt.managedbuild.toolchain.gnu.base.1467187978/CWD/operation=replace +environment/project/cdt.managedbuild.toolchain.gnu.base.1467187978/CWD/value=D\:\\git\\UbixOS\\ +environment/project/cdt.managedbuild.toolchain.gnu.base.1467187978/PWD/delimiter=; +environment/project/cdt.managedbuild.toolchain.gnu.base.1467187978/PWD/operation=replace +environment/project/cdt.managedbuild.toolchain.gnu.base.1467187978/PWD/value=D\:\\git\\UbixOS\\ +environment/project/cdt.managedbuild.toolchain.gnu.base.1467187978/append=true +environment/project/cdt.managedbuild.toolchain.gnu.base.1467187978/appendContributed=true diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs new file mode 100644 index 0000000..b196c64 --- /dev/null +++ b/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..db57540 --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ +all: universe + +universe: + (cd src; make all) + +clean: + (cd src;make clean) \ No newline at end of file diff --git a/doc/html/Makefile_8inc-source.html b/doc/html/Makefile_8inc-source.html index 6cb6dd5..c4d498d 100644 --- a/doc/html/Makefile_8inc-source.html +++ b/doc/html/Makefile_8inc-source.html @@ -1,6 +1,6 @@ -UbixOS V2: src/sys/Makefile.inc Source File +Makefile.incl Source File diff --git a/doc/html/Makefile_8inc.html b/doc/html/Makefile_8inc.html index a76a767..36d9095 100644 --- a/doc/html/Makefile_8inc.html +++ b/doc/html/Makefile_8inc.html @@ -1,6 +1,6 @@ -UbixOS V2: src/sys/Makefile.inc File Reference +Makefile.incl File Reference diff --git a/doc/xml/Makefile_8inc.xml b/doc/xml/Makefile_8inc.xml index 03dee90..a4ca408 100644 --- a/doc/xml/Makefile_8inc.xml +++ b/doc/xml/Makefile_8inc.xml @@ -14,6 +14,6 @@ CFLAGS=-Wall-nostdlib-nostdinc-fno-builtin-fno-exceptions-O KERNEL=ubix.elf - +Makefile.incl"/> diff --git a/src/Makefile b/src/Makefile index 77fab31..f0e76be 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile 148 2016-01-18 19:34:32Z reddawg $ # The System Makefile (C) 2002 The UbixOS Project -_ARCH?= ${MACHINE_ARCH} +_ARCH?=${MACHINE_ARCH} _ARCH=i386 diff --git a/src/Makefile.inc b/src/Makefile.inc deleted file mode 100644 index d667b3e..0000000 --- a/src/Makefile.inc +++ /dev/null @@ -1,13 +0,0 @@ -# $Id: Makefile.inc 89 2016-01-12 00:20:40Z reddawg $ -# Global 'Source' Options - -# allow you to change your default compiler without affecting your other work -#MrOlsen (2016-01-10) NOTE: I pass all this now -CFLAGS = -m32 -#CC = cc -#CXX = c++ -#LD = ld -#AR = ar -REMOVE = rm -rf - -FD_DEVICE = /dev/md0 diff --git a/src/Makefile.incl b/src/Makefile.incl new file mode 100644 index 0000000..5b03fc0 --- /dev/null +++ b/src/Makefile.incl @@ -0,0 +1,16 @@ +# $Id: Makefile.inc 89 2016-01-12 00:20:40Z reddawg $ +# Global 'Source' Options + +# allow you to change your default compiler without affecting your other work +#MrOlsen (2016-01-10) NOTE: I pass all this now +#CFLAGS = -m32 +#CC = cc +#CXX = c++ +#LD = ld +#AR = ar + + +#Glogal Override And Defs +REMOVE = rm -rf + +FD_DEVICE = /dev/md0 diff --git a/src/bin/Makefile.inc b/src/bin/Makefile.inc deleted file mode 100644 index 2d0ca5d..0000000 --- a/src/bin/Makefile.inc +++ /dev/null @@ -1,11 +0,0 @@ -# 'bin' options - -CFLAGS = -m32 -nostdlib -nostdinc -fno-builtin - -INCLUDES = -I../../include - -#LIBRARIES = ../../lib/libc_old/math/*.o ../../lib/libc_old/quad/*.o ../../lib/libc_old/stdio/*.o ../../lib/libc_old/stdlib/*.o ../../lib/libc_old/sys/*.o ../../lib/libc_old/string/*.o ../../lib/libc_old/locale/*.o ../../lib/libc_old/gen/*.o ../../lib/libc_old/generic/*.o ../../lib/libc_old/*/*.o - -LIBRARIES = ../../lib/libc_old/*/*.o - -STARTUP = ../../lib/ubix/*.o diff --git a/src/bin/Makefile.incl b/src/bin/Makefile.incl new file mode 100644 index 0000000..2d0ca5d --- /dev/null +++ b/src/bin/Makefile.incl @@ -0,0 +1,11 @@ +# 'bin' options + +CFLAGS = -m32 -nostdlib -nostdinc -fno-builtin + +INCLUDES = -I../../include + +#LIBRARIES = ../../lib/libc_old/math/*.o ../../lib/libc_old/quad/*.o ../../lib/libc_old/stdio/*.o ../../lib/libc_old/stdlib/*.o ../../lib/libc_old/sys/*.o ../../lib/libc_old/string/*.o ../../lib/libc_old/locale/*.o ../../lib/libc_old/gen/*.o ../../lib/libc_old/generic/*.o ../../lib/libc_old/*/*.o + +LIBRARIES = ../../lib/libc_old/*/*.o + +STARTUP = ../../lib/ubix/*.o diff --git a/src/bin/clock/Makefile b/src/bin/clock/Makefile index e008787..3f7b34d 100644 --- a/src/bin/clock/Makefile +++ b/src/bin/clock/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/cp/Makefile b/src/bin/cp/Makefile index 87fa208..e1d1ea1 100644 --- a/src/bin/cp/Makefile +++ b/src/bin/cp/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/disklabel/Makefile b/src/bin/disklabel/Makefile index 60fdca4..26003be 100644 --- a/src/bin/disklabel/Makefile +++ b/src/bin/disklabel/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/edit/Makefile b/src/bin/edit/Makefile index e34dbcd..44505b1 100644 --- a/src/bin/edit/Makefile +++ b/src/bin/edit/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/fdisk/Makefile b/src/bin/fdisk/Makefile index e0619bb..b125aae 100644 --- a/src/bin/fdisk/Makefile +++ b/src/bin/fdisk/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/format/Makefile b/src/bin/format/Makefile index a51dd80..418f569 100644 --- a/src/bin/format/Makefile +++ b/src/bin/format/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/init/Makefile b/src/bin/init/Makefile index 4166f2c..bfbe689 100644 --- a/src/bin/init/Makefile +++ b/src/bin/init/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/launcher/Makefile b/src/bin/launcher/Makefile index 0dab207..21974b0 100644 --- a/src/bin/launcher/Makefile +++ b/src/bin/launcher/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +Makefile.incl +Makefile.incl INCLUDES += -I./include -I../../lib/views/sunlight/include -I../../lib/libcpp/include -I../../lib/objgfx40/objgfx40 CFLAGS = -nostdlib -fno-exceptions -frtti diff --git a/src/bin/ld/Makefile b/src/bin/ld/Makefile index 784cf1a..c9a6ba4 100644 --- a/src/bin/ld/Makefile +++ b/src/bin/ld/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/login/Makefile b/src/bin/login/Makefile index fb43756..01e2f78 100644 --- a/src/bin/login/Makefile +++ b/src/bin/login/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/ls/Makefile b/src/bin/ls/Makefile index 534a265..fe8e375 100644 --- a/src/bin/ls/Makefile +++ b/src/bin/ls/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/mount/Makefile b/src/bin/mount/Makefile index f756f42..a860e2d 100644 --- a/src/bin/mount/Makefile +++ b/src/bin/mount/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/muffin/Makefile b/src/bin/muffin/Makefile index 61e058c..7d52000 100644 --- a/src/bin/muffin/Makefile +++ b/src/bin/muffin/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Compiler Flags CFLAGS = -DNOBOOL -fno-builtin -fno-exceptions -nostdlib -nostdinc diff --git a/src/bin/rtld-elf/Makefile b/src/bin/rtld-elf/Makefile index 452d385..734c27d 100644 --- a/src/bin/rtld-elf/Makefile +++ b/src/bin/rtld-elf/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl INCLUDES = -I../../include.new -I./ diff --git a/src/bin/sh/Makefile b/src/bin/sh/Makefile index 9729c68..47eeb1d 100644 --- a/src/bin/sh/Makefile +++ b/src/bin/sh/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +Makefile.incl +Makefile.incl #Linker LD = ld diff --git a/src/bin/shell/Makefile b/src/bin/shell/Makefile index e48a2b3..dbf897e 100644 --- a/src/bin/shell/Makefile +++ b/src/bin/shell/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/stat/Makefile b/src/bin/stat/Makefile index a690034..7730ee1 100644 --- a/src/bin/stat/Makefile +++ b/src/bin/stat/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/ttyd/Makefile b/src/bin/ttyd/Makefile index 0939851..60ee069 100644 --- a/src/bin/ttyd/Makefile +++ b/src/bin/ttyd/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/ubistry/Makefile b/src/bin/ubistry/Makefile index 448bf3c..cdb7a53 100644 --- a/src/bin/ubistry/Makefile +++ b/src/bin/ubistry/Makefile @@ -2,8 +2,8 @@ # Application Makefile (C) 2002-2004 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Linker LD = ld diff --git a/src/bin/views/Makefile b/src/bin/views/Makefile index ef71de2..1de7a94 100644 --- a/src/bin/views/Makefile +++ b/src/bin/views/Makefile @@ -2,7 +2,7 @@ # Application Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc +Makefile.incl #Compiler Flags CFLAGS = -I../../lib/libc/include -fno-builtin -nostdlib -nostdinc diff --git a/src/include.new/ufs/ffs/fs.h b/src/include.new/ufs/ffs/fs.h index 8e5e202..34f8275 100644 --- a/src/include.new/ufs/ffs/fs.h +++ b/src/include.new/ufs/ffs/fs.h @@ -69,10 +69,10 @@ * SBLOCKSEARCH specifies the order in which the locations should be searched. */ #define SBLOCK_FLOPPY 0 -#define SBLOCK_UFS1 8192/512 -#define SBLOCK_UFS2 65536/512 -#define SBLOCK_PIGGY 262144/512 -#define SBLOCKSIZE 8192/512 +#define SBLOCK_UFS1 8192 +#define SBLOCK_UFS2 65536 +#define SBLOCK_PIGGY 262144 +#define SBLOCKSIZE 8192 #define SBLOCKSEARCH \ { SBLOCK_UFS2, SBLOCK_UFS1, SBLOCK_FLOPPY, SBLOCK_PIGGY, -1 } diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc deleted file mode 100644 index c2b1de8..0000000 --- a/src/lib/Makefile.inc +++ /dev/null @@ -1,11 +0,0 @@ -# $Id: Makefile.inc 103 2016-01-12 05:32:24Z reddawg $ -# 'lib' options - -LDFLAGS = -Bshareable -#CFLAGS = -fpic -DPIC -O2 -fno-strict-aliasing -pipe -D__DBINTERFACE_PRIVATE -DPOSIX_MISTAKE -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -DYP -DHESIOD -Wsystem-headers -Wall -Wno-format-y2k -Wno-uninitialized -CFLAGS = -m32 -fno-builtin -Wno-uninitialized -O2 -fno-strict-aliasing -pipe - -INCLUDES = -I../include -I../../../include -I../i386 -I../include - -INCLUDES = -I${INCLUDE} -CFLAGS = -m32 ${WFLAGS} -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -O diff --git a/src/lib/Makefile.incl b/src/lib/Makefile.incl new file mode 100644 index 0000000..c2b1de8 --- /dev/null +++ b/src/lib/Makefile.incl @@ -0,0 +1,11 @@ +# $Id: Makefile.inc 103 2016-01-12 05:32:24Z reddawg $ +# 'lib' options + +LDFLAGS = -Bshareable +#CFLAGS = -fpic -DPIC -O2 -fno-strict-aliasing -pipe -D__DBINTERFACE_PRIVATE -DPOSIX_MISTAKE -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -DYP -DHESIOD -Wsystem-headers -Wall -Wno-format-y2k -Wno-uninitialized +CFLAGS = -m32 -fno-builtin -Wno-uninitialized -O2 -fno-strict-aliasing -pipe + +INCLUDES = -I../include -I../../../include -I../i386 -I../include + +INCLUDES = -I${INCLUDE} +CFLAGS = -m32 ${WFLAGS} -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -O diff --git a/src/lib/csu/Makefile b/src/lib/csu/Makefile index d586729..d9b8772 100644 --- a/src/lib/csu/Makefile +++ b/src/lib/csu/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl CFLAGS = -m32 -nostdlib -nostdinc -fno-builtin -Wno-uninitialized -O2 -fno-strict-aliasing -pipe -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls #-DGCRT diff --git a/src/lib/libc/Makefile b/src/lib/libc/Makefile index c2db54d..adc2be8 100644 --- a/src/lib/libc/Makefile +++ b/src/lib/libc/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Objects OBJS = diff --git a/src/lib/libc/Makefile.inc b/src/lib/libc/Makefile.inc deleted file mode 100644 index f26452b..0000000 --- a/src/lib/libc/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -#MrOlsen (2016-01-11) NOTE Temp Disable INCLUDES = -I../include -I../../../include.new -INCLUDES+=-I../include -I../locale -CFLAGS = -fpic -DPIC -O2 -fno-strict-aliasing -pipe -D__DBINTERFACE_PRIVATE -DPOSIX_MISTAKE -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -DYP -DHESIOD -Wsystem-headers -Wall -Wno-format-y2k -Wno-uninitialized -CFLAGS += -DPORTMAP -D__DBINTERFACE_PRIVATE -nostdinc #-DPIC diff --git a/src/lib/libc/Makefile.incl b/src/lib/libc/Makefile.incl new file mode 100644 index 0000000..f26452b --- /dev/null +++ b/src/lib/libc/Makefile.incl @@ -0,0 +1,4 @@ +#MrOlsen (2016-01-11) NOTE Temp Disable INCLUDES = -I../include -I../../../include.new +INCLUDES+=-I../include -I../locale +CFLAGS = -fpic -DPIC -O2 -fno-strict-aliasing -pipe -D__DBINTERFACE_PRIVATE -DPOSIX_MISTAKE -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -DYP -DHESIOD -Wsystem-headers -Wall -Wno-format-y2k -Wno-uninitialized +CFLAGS += -DPORTMAP -D__DBINTERFACE_PRIVATE -nostdinc #-DPIC diff --git a/src/lib/libc/compat-43/Makefile b/src/lib/libc/compat-43/Makefile index 7cd80f2..c869a28 100644 --- a/src/lib/libc/compat-43/Makefile +++ b/src/lib/libc/compat-43/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ diff --git a/src/lib/libc/db/Makefile.inc b/src/lib/libc/db/Makefile.inc deleted file mode 100755 index 55ed355..0000000 --- a/src/lib/libc/db/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDES = -I../../include -I../../../../include.new -CFLAGS += -DPORTMAP -D__DBINTERFACE_PRIVATE -nostdinc diff --git a/src/lib/libc/db/Makefile.incl b/src/lib/libc/db/Makefile.incl new file mode 100755 index 0000000..55ed355 --- /dev/null +++ b/src/lib/libc/db/Makefile.incl @@ -0,0 +1,2 @@ +INCLUDES = -I../../include -I../../../../include.new +CFLAGS += -DPORTMAP -D__DBINTERFACE_PRIVATE -nostdinc diff --git a/src/lib/libc/db/btree/Makefile b/src/lib/libc/db/btree/Makefile index eacf0ec..b5e17cc 100644 --- a/src/lib/libc/db/btree/Makefile +++ b/src/lib/libc/db/btree/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +include ../../../../Makefile.incl +include ../../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../ -I../../include diff --git a/src/lib/libc/db/db/Makefile b/src/lib/libc/db/db/Makefile index 4f71af9..750cf27 100644 --- a/src/lib/libc/db/db/Makefile +++ b/src/lib/libc/db/db/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +include ../../../../Makefile.incl +include ../../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../ diff --git a/src/lib/libc/db/hash/Makefile b/src/lib/libc/db/hash/Makefile index c67ac02..b0b99a9 100644 --- a/src/lib/libc/db/hash/Makefile +++ b/src/lib/libc/db/hash/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +include ../../../../Makefile.incl +include ../../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../ -I../../include diff --git a/src/lib/libc/db/mpool/Makefile b/src/lib/libc/db/mpool/Makefile index 0150d66..618fce5 100644 --- a/src/lib/libc/db/mpool/Makefile +++ b/src/lib/libc/db/mpool/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +include ../../../../Makefile.incl +include ../../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../ -I../../include diff --git a/src/lib/libc/db/recno/Makefile b/src/lib/libc/db/recno/Makefile index 3eca7a7..86e1207 100644 --- a/src/lib/libc/db/recno/Makefile +++ b/src/lib/libc/db/recno/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +include ../../../../Makefile.incl +include ../../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../ -I../../include diff --git a/src/lib/libc/gdtoa/Makefile b/src/lib/libc/gdtoa/Makefile index 5710415..d135e56 100644 --- a/src/lib/libc/gdtoa/Makefile +++ b/src/lib/libc/gdtoa/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ -I../../../contrib/gdtoa -I../i386 diff --git a/src/lib/libc/gen/Makefile b/src/lib/libc/gen/Makefile index 46feedf..c1542b1 100644 --- a/src/lib/libc/gen/Makefile +++ b/src/lib/libc/gen/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ -I../i386 diff --git a/src/lib/libc/gmon/Makefile b/src/lib/libc/gmon/Makefile index a02c452..2e35617 100644 --- a/src/lib/libc/gmon/Makefile +++ b/src/lib/libc/gmon/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ diff --git a/src/lib/libc/i386/Makefile.inc b/src/lib/libc/i386/Makefile.inc deleted file mode 100755 index eeb7ba5..0000000 --- a/src/lib/libc/i386/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDES = -I../../include -I../../../../include.new -CFLAGS += -DPORTMAP -D__DBINTERFACE_PRIVATE -nostdinc #-DPIC diff --git a/src/lib/libc/i386/Makefile.incl b/src/lib/libc/i386/Makefile.incl new file mode 100755 index 0000000..eeb7ba5 --- /dev/null +++ b/src/lib/libc/i386/Makefile.incl @@ -0,0 +1,2 @@ +INCLUDES = -I../../include -I../../../../include.new +CFLAGS += -DPORTMAP -D__DBINTERFACE_PRIVATE -nostdinc #-DPIC diff --git a/src/lib/libc/i386/gen/Makefile b/src/lib/libc/i386/gen/Makefile index c5cccc2..7b84a9b 100644 --- a/src/lib/libc/i386/gen/Makefile +++ b/src/lib/libc/i386/gen/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +include ../../../../Makefile.incl +include ../../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../ diff --git a/src/lib/libc/i386/net/Makefile b/src/lib/libc/i386/net/Makefile index 3de6802..0c19920 100644 --- a/src/lib/libc/i386/net/Makefile +++ b/src/lib/libc/i386/net/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +include ../../../../Makefile.incl +include ../../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../ diff --git a/src/lib/libc/i386/stdlib/Makefile b/src/lib/libc/i386/stdlib/Makefile index 40da49d..6036550 100644 --- a/src/lib/libc/i386/stdlib/Makefile +++ b/src/lib/libc/i386/stdlib/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +include ../../../../Makefile.incl +include ../../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../ diff --git a/src/lib/libc/i386/string/Makefile b/src/lib/libc/i386/string/Makefile index 4a3ac8e..f9a2878 100644 --- a/src/lib/libc/i386/string/Makefile +++ b/src/lib/libc/i386/string/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +include ../../../../Makefile.incl +include ../../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../ diff --git a/src/lib/libc/i386/sys/Makefile b/src/lib/libc/i386/sys/Makefile index 97d05bc..7ec3776 100644 --- a/src/lib/libc/i386/sys/Makefile +++ b/src/lib/libc/i386/sys/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +include ../../../../Makefile.incl +include ../../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../ diff --git a/src/lib/libc/i386/syscalls/Makefile b/src/lib/libc/i386/syscalls/Makefile index 54368a9..c8abba3 100644 --- a/src/lib/libc/i386/syscalls/Makefile +++ b/src/lib/libc/i386/syscalls/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../../Makefile.inc -include ../../../Makefile.inc -include ../Makefile.inc +include ../../../../Makefile.incl +include ../../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../ diff --git a/src/lib/libc/inet/Makefile b/src/lib/libc/inet/Makefile index 636c939..e6be2e2 100644 --- a/src/lib/libc/inet/Makefile +++ b/src/lib/libc/inet/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ diff --git a/src/lib/libc/isc/Makefile b/src/lib/libc/isc/Makefile index c4aaed5..3866201 100644 --- a/src/lib/libc/isc/Makefile +++ b/src/lib/libc/isc/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ diff --git a/src/lib/libc/locale/Makefile b/src/lib/libc/locale/Makefile index b089c5b..89f58b9 100644 --- a/src/lib/libc/locale/Makefile +++ b/src/lib/libc/locale/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ diff --git a/src/lib/libc/nameser/Makefile b/src/lib/libc/nameser/Makefile index 15f23ae..d05c7bd 100644 --- a/src/lib/libc/nameser/Makefile +++ b/src/lib/libc/nameser/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ diff --git a/src/lib/libc/net/Makefile b/src/lib/libc/net/Makefile index d5bfcce..4387190 100644 --- a/src/lib/libc/net/Makefile +++ b/src/lib/libc/net/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ -I../resolv diff --git a/src/lib/libc/nls/Makefile b/src/lib/libc/nls/Makefile index a9b5681..62c1f63 100644 --- a/src/lib/libc/nls/Makefile +++ b/src/lib/libc/nls/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ diff --git a/src/lib/libc/posix1e/Makefile b/src/lib/libc/posix1e/Makefile index 6eefe42..0b709d8 100644 --- a/src/lib/libc/posix1e/Makefile +++ b/src/lib/libc/posix1e/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ diff --git a/src/lib/libc/posix1e/Makefile.inc b/src/lib/libc/posix1e/Makefile.inc deleted file mode 100644 index 46fb12e..0000000 --- a/src/lib/libc/posix1e/Makefile.inc +++ /dev/null @@ -1,124 +0,0 @@ -# $FreeBSD: releng/10.2/lib/libc/posix1e/Makefile.inc 209147 2010-06-14 02:26:13Z kientzle $ - -.PATH: ${.CURDIR}/posix1e - -CFLAGS+=-D_ACL_PRIVATE - -# Copy kern/subr_acl_nfs4.c to the libc object directory. -subr_acl_nfs4.c: ${.CURDIR}/../../sys/kern/subr_acl_nfs4.c - cat ${.ALLSRC} > ${.TARGET} - -SRCS+= acl_branding.c \ - acl_calc_mask.c \ - acl_copy.c \ - acl_compat.c \ - acl_delete.c \ - acl_delete_entry.c \ - acl_entry.c \ - acl_flag.c \ - acl_free.c \ - acl_from_text.c \ - acl_from_text_nfs4.c \ - acl_get.c \ - acl_id_to_name.c \ - acl_init.c \ - acl_perm.c \ - acl_set.c \ - acl_strip.c \ - acl_support.c \ - acl_support_nfs4.c \ - acl_to_text.c \ - acl_to_text_nfs4.c \ - acl_valid.c \ - extattr.c \ - mac.c \ - mac_exec.c \ - mac_get.c \ - mac_set.c \ - subr_acl_nfs4.c - -SYM_MAPS+=${.CURDIR}/posix1e/Symbol.map - -MAN+= acl.3 \ - acl_add_flag_np.3 \ - acl_add_perm.3 \ - acl_calc_mask.3 \ - acl_clear_flags_np.3 \ - acl_clear_perms.3 \ - acl_copy_entry.3 \ - acl_create_entry.3 \ - acl_delete.3 \ - acl_delete_entry.3 \ - acl_delete_flag_np.3 \ - acl_delete_perm.3 \ - acl_dup.3 \ - acl_free.3 \ - acl_from_text.3 \ - acl_get.3 \ - acl_get_brand_np.3 \ - acl_get_entry.3 \ - acl_get_entry_type_np.3 \ - acl_get_flagset_np.3 \ - acl_get_flag_np.3 \ - acl_get_permset.3 \ - acl_get_perm_np.3 \ - acl_get_qualifier.3 \ - acl_get_tag_type.3 \ - acl_init.3 \ - acl_is_trivial_np.3 \ - acl_set.3 \ - acl_set_entry_type_np.3 \ - acl_set_flagset_np.3 \ - acl_set_permset.3 \ - acl_set_qualifier.3 \ - acl_set_tag_type.3 \ - acl_strip_np.3 \ - acl_to_text.3 \ - acl_valid.3 \ - extattr.3 \ - mac.3 \ - mac.conf.5 \ - mac_free.3 \ - mac_is_present.3 \ - mac_get.3 \ - mac_prepare.3 \ - mac_set.3 \ - mac_text.3 \ - posix1e.3 - -MLINKS+=acl_create_entry.3 acl_create_entry_np.3\ - acl_delete.3 acl_delete_def_file.3 \ - acl_delete.3 acl_delete_file_np.3 \ - acl_delete.3 acl_delete_fd_np.3 \ - acl_delete_entry.3 acl_delete_entry_np.3\ - acl_get.3 acl_get_file.3 \ - acl_get.3 acl_get_fd.3 \ - acl_get.3 acl_get_fd_np.3 \ - acl_get.3 acl_get_link_np.3 \ - acl_set.3 acl_set_file.3 \ - acl_set.3 acl_set_fd.3 \ - acl_set.3 acl_set_fd_np.3 \ - acl_set.3 acl_set_link_np.3 \ - acl_to_text.3 acl_to_text_np.3 \ - acl_valid.3 acl_valid_file_np.3 \ - acl_valid.3 acl_valid_fd_np.3 \ - extattr.3 extattr_namespace_to_string.3 \ - extattr.3 extattr_string_to_namespace.3 \ - mac_get.3 mac_get_fd.3 \ - mac_get.3 mac_get_file.3 \ - mac_get.3 mac_get_link.3 \ - mac_get.3 mac_get_peer.3 \ - mac_get.3 mac_get_pid.3 \ - mac_get.3 mac_get_proc.3 \ - mac_prepare.3 mac_prepare_file_label.3 \ - mac_prepare.3 mac_prepare_ifnet_label.3 \ - mac_prepare.3 mac_prepare_process_label.3 \ - mac_prepare.3 mac_prepare_type.3 \ - mac_set.3 mac_set_fd.3 \ - mac_set.3 mac_set_file.3 \ - mac_set.3 mac_set_link.3 \ - mac_set.3 mac_set_proc.3 \ - mac_text.3 mac_from_text.3 \ - mac_text.3 mac_to_text.3 - -CLEANFILES+= subr_acl_nfs4.c diff --git a/src/lib/libc/posix1e/Makefile.incl b/src/lib/libc/posix1e/Makefile.incl new file mode 100644 index 0000000..b09921e --- /dev/null +++ b/src/lib/libc/posix1e/Makefile.incl @@ -0,0 +1,124 @@ +Makefile.incl 209147 2010-06-14 02:26:13Z kientzle $ + +.PATH: ${.CURDIR}/posix1e + +CFLAGS+=-D_ACL_PRIVATE + +# Copy kern/subr_acl_nfs4.c to the libc object directory. +subr_acl_nfs4.c: ${.CURDIR}/../../sys/kern/subr_acl_nfs4.c + cat ${.ALLSRC} > ${.TARGET} + +SRCS+= acl_branding.c \ + acl_calc_mask.c \ + acl_copy.c \ + acl_compat.c \ + acl_delete.c \ + acl_delete_entry.c \ + acl_entry.c \ + acl_flag.c \ + acl_free.c \ + acl_from_text.c \ + acl_from_text_nfs4.c \ + acl_get.c \ + acl_id_to_name.c \ + acl_init.c \ + acl_perm.c \ + acl_set.c \ + acl_strip.c \ + acl_support.c \ + acl_support_nfs4.c \ + acl_to_text.c \ + acl_to_text_nfs4.c \ + acl_valid.c \ + extattr.c \ + mac.c \ + mac_exec.c \ + mac_get.c \ + mac_set.c \ + subr_acl_nfs4.c + +SYM_MAPS+=${.CURDIR}/posix1e/Symbol.map + +MAN+= acl.3 \ + acl_add_flag_np.3 \ + acl_add_perm.3 \ + acl_calc_mask.3 \ + acl_clear_flags_np.3 \ + acl_clear_perms.3 \ + acl_copy_entry.3 \ + acl_create_entry.3 \ + acl_delete.3 \ + acl_delete_entry.3 \ + acl_delete_flag_np.3 \ + acl_delete_perm.3 \ + acl_dup.3 \ + acl_free.3 \ + acl_from_text.3 \ + acl_get.3 \ + acl_get_brand_np.3 \ + acl_get_entry.3 \ + acl_get_entry_type_np.3 \ + acl_get_flagset_np.3 \ + acl_get_flag_np.3 \ + acl_get_permset.3 \ + acl_get_perm_np.3 \ + acl_get_qualifier.3 \ + acl_get_tag_type.3 \ + acl_init.3 \ + acl_is_trivial_np.3 \ + acl_set.3 \ + acl_set_entry_type_np.3 \ + acl_set_flagset_np.3 \ + acl_set_permset.3 \ + acl_set_qualifier.3 \ + acl_set_tag_type.3 \ + acl_strip_np.3 \ + acl_to_text.3 \ + acl_valid.3 \ + extattr.3 \ + mac.3 \ + mac.conf.5 \ + mac_free.3 \ + mac_is_present.3 \ + mac_get.3 \ + mac_prepare.3 \ + mac_set.3 \ + mac_text.3 \ + posix1e.3 + +MLINKS+=acl_create_entry.3 acl_create_entry_np.3\ + acl_delete.3 acl_delete_def_file.3 \ + acl_delete.3 acl_delete_file_np.3 \ + acl_delete.3 acl_delete_fd_np.3 \ + acl_delete_entry.3 acl_delete_entry_np.3\ + acl_get.3 acl_get_file.3 \ + acl_get.3 acl_get_fd.3 \ + acl_get.3 acl_get_fd_np.3 \ + acl_get.3 acl_get_link_np.3 \ + acl_set.3 acl_set_file.3 \ + acl_set.3 acl_set_fd.3 \ + acl_set.3 acl_set_fd_np.3 \ + acl_set.3 acl_set_link_np.3 \ + acl_to_text.3 acl_to_text_np.3 \ + acl_valid.3 acl_valid_file_np.3 \ + acl_valid.3 acl_valid_fd_np.3 \ + extattr.3 extattr_namespace_to_string.3 \ + extattr.3 extattr_string_to_namespace.3 \ + mac_get.3 mac_get_fd.3 \ + mac_get.3 mac_get_file.3 \ + mac_get.3 mac_get_link.3 \ + mac_get.3 mac_get_peer.3 \ + mac_get.3 mac_get_pid.3 \ + mac_get.3 mac_get_proc.3 \ + mac_prepare.3 mac_prepare_file_label.3 \ + mac_prepare.3 mac_prepare_ifnet_label.3 \ + mac_prepare.3 mac_prepare_process_label.3 \ + mac_prepare.3 mac_prepare_type.3 \ + mac_set.3 mac_set_fd.3 \ + mac_set.3 mac_set_file.3 \ + mac_set.3 mac_set_link.3 \ + mac_set.3 mac_set_proc.3 \ + mac_text.3 mac_from_text.3 \ + mac_text.3 mac_to_text.3 + +CLEANFILES+= subr_acl_nfs4.c diff --git a/src/lib/libc/quad/Makefile b/src/lib/libc/quad/Makefile index 201f9c4..c8c97c2 100644 --- a/src/lib/libc/quad/Makefile +++ b/src/lib/libc/quad/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl #Objects #OBJS = anddi3.o adddi3.o qdivrem.o umoddi3.o udivdi3.o divdi3.o diff --git a/src/lib/libc/regex/Makefile b/src/lib/libc/regex/Makefile index 0ee0fb6..a9b742b 100644 --- a/src/lib/libc/regex/Makefile +++ b/src/lib/libc/regex/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ diff --git a/src/lib/libc/resolv/Makefile b/src/lib/libc/resolv/Makefile index ac6cc65..f4377a1 100644 --- a/src/lib/libc/resolv/Makefile +++ b/src/lib/libc/resolv/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ diff --git a/src/lib/libc/rpc/Makefile b/src/lib/libc/rpc/Makefile index 6763709..7c4444c 100644 --- a/src/lib/libc/rpc/Makefile +++ b/src/lib/libc/rpc/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ diff --git a/src/lib/libc/stdio/Makefile b/src/lib/libc/stdio/Makefile index 135a766..7bf5c77 100644 --- a/src/lib/libc/stdio/Makefile +++ b/src/lib/libc/stdio/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ -I../../../contrib/gdtoa/ -I../i386 diff --git a/src/lib/libc/stdlib/Makefile b/src/lib/libc/stdlib/Makefile index 5ea7b93..755c409 100644 --- a/src/lib/libc/stdlib/Makefile +++ b/src/lib/libc/stdlib/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl #Objects OBJS = _Exit.o a64l.o abort.o atexit.o atof.o atoi.o atol.o atoll.o bsearch.o calloc.o exit.o getenv.o getopt.o getopt_long.o getsubopt.o grantpt.o hcreate.o heapsort.o imaxabs.o imaxdiv.o insque.o l64a.o llabs.o lldiv.o lsearch.o malloc.o merge.o putenv.o qsort.o qsort_r.o radixsort.o rand.o random.o reallocf.o realpath.o remque.o setenv.o strfmon.o strtoimax.o strtol.o strtoll.o strtonum.o strtoq.o strtoul.o strtoull.o strtoumax.o strtouq.o system.o tdelete.o tfind.o tsearch.o twalk.o diff --git a/src/lib/libc/stdtime/Makefile b/src/lib/libc/stdtime/Makefile index 96702bd..fc3123f 100644 --- a/src/lib/libc/stdtime/Makefile +++ b/src/lib/libc/stdtime/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale diff --git a/src/lib/libc/string/Makefile b/src/lib/libc/string/Makefile index 0550c35..4b9b460 100644 --- a/src/lib/libc/string/Makefile +++ b/src/lib/libc/string/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ diff --git a/src/lib/libc/sys/Makefile b/src/lib/libc/sys/Makefile index 205aab8..5d608a8 100644 --- a/src/lib/libc/sys/Makefile +++ b/src/lib/libc/sys/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl #Objects OBJS = __error.o ftruncate.o lseek.o mmap.o pread.o pwrite.o truncate.o diff --git a/src/lib/libc/uthread/Makefile b/src/lib/libc/uthread/Makefile index 85b3af1..5f38ddd 100644 --- a/src/lib/libc/uthread/Makefile +++ b/src/lib/libc/uthread/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../locale/ -I. diff --git a/src/lib/libc/uuid/Makefile b/src/lib/libc/uuid/Makefile index 9895852..b2dfb0a 100644 --- a/src/lib/libc/uuid/Makefile +++ b/src/lib/libc/uuid/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl #Objects OBJS = uuid_compare.o uuid_create.o uuid_create_nil.o uuid_equal.o uuid_from_string.o uuid_hash.o uuid_is_nil.o uuid_to_string.o diff --git a/src/lib/libc/xdr/Makefile b/src/lib/libc/xdr/Makefile index cd1c833..ec5017d 100644 --- a/src/lib/libc/xdr/Makefile +++ b/src/lib/libc/xdr/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../rpc diff --git a/src/lib/libc/yp/Makefile b/src/lib/libc/yp/Makefile index 17785ba..0552057 100644 --- a/src/lib/libc/yp/Makefile +++ b/src/lib/libc/yp/Makefile @@ -2,9 +2,9 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc -include ../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl +include ../Makefile.incl #Objects OBJS = xdryp.o yp_xdr.o yplib.o diff --git a/src/lib/libc_bsd/Makefile b/src/lib/libc_bsd/Makefile index 3a9a765..bdc7151 100644 --- a/src/lib/libc_bsd/Makefile +++ b/src/lib/libc_bsd/Makefile @@ -62,50 +62,50 @@ MIASM= NOASM= -.include "${.CURDIR}/${LIBC_ARCH}/Makefile.inc" -.include "${.CURDIR}/db/Makefile.inc" -.include "${.CURDIR}/compat-43/Makefile.inc" -.include "${.CURDIR}/gdtoa/Makefile.inc" -.include "${.CURDIR}/gen/Makefile.inc" -.include "${.CURDIR}/gmon/Makefile.inc" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" .if ${MK_ICONV} != "no" -.include "${.CURDIR}/iconv/Makefile.inc" +Makefile.incl" .endif -.include "${.CURDIR}/inet/Makefile.inc" -.include "${.CURDIR}/isc/Makefile.inc" -.include "${.CURDIR}/locale/Makefile.inc" -.include "${.CURDIR}/md/Makefile.inc" -.include "${.CURDIR}/nameser/Makefile.inc" -.include "${.CURDIR}/net/Makefile.inc" -.include "${.CURDIR}/nls/Makefile.inc" -.include "${.CURDIR}/posix1e/Makefile.inc" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" .if ${LIBC_ARCH} != "amd64" && \ ${LIBC_ARCH} != "ia64" && \ ${LIBC_ARCH} != "powerpc64" && \ ${LIBC_ARCH} != "sparc64" && \ ${MACHINE_ARCH:Mmipsn32*} == "" && \ ${MACHINE_ARCH:Mmips64*} == "" -.include "${.CURDIR}/quad/Makefile.inc" +Makefile.incl" .endif -.include "${.CURDIR}/regex/Makefile.inc" -.include "${.CURDIR}/resolv/Makefile.inc" -.include "${.CURDIR}/stdio/Makefile.inc" -.include "${.CURDIR}/stdlib/Makefile.inc" -.include "${.CURDIR}/stdlib/jemalloc/Makefile.inc" -.include "${.CURDIR}/stdtime/Makefile.inc" -.include "${.CURDIR}/string/Makefile.inc" -.include "${.CURDIR}/sys/Makefile.inc" -.include "${.CURDIR}/rpc/Makefile.inc" -.include "${.CURDIR}/uuid/Makefile.inc" -.include "${.CURDIR}/xdr/Makefile.inc" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" .if ${LIBC_ARCH} == "arm" || ${LIBC_ARCH} == "mips" -.include "${.CURDIR}/softfloat/Makefile.inc" +Makefile.incl" .endif .if ${MK_NIS} != "no" CFLAGS+= -DYP -.include "${.CURDIR}/yp/Makefile.inc" +Makefile.incl" .endif -.include "${.CURDIR}/capability/Makefile.inc" +Makefile.incl" .if ${MK_HESIOD} != "no" CFLAGS+= -DHESIOD .endif diff --git a/src/lib/libc_bsd/amd64/Makefile.inc b/src/lib/libc_bsd/amd64/Makefile.inc index 8c3cd87..c1849bd 100644 --- a/src/lib/libc_bsd/amd64/Makefile.inc +++ b/src/lib/libc_bsd/amd64/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/amd64/Makefile.inc 174204 2007-12-03 07:17:33Z das $ +Makefile.incl 174204 2007-12-03 07:17:33Z das $ # # Machine dependent definitions for the amd64 architecture. # diff --git a/src/lib/libc_bsd/amd64/gen/Makefile.inc b/src/lib/libc_bsd/amd64/gen/Makefile.inc index ac0a9cc..ca987bf 100644 --- a/src/lib/libc_bsd/amd64/gen/Makefile.inc +++ b/src/lib/libc_bsd/amd64/gen/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/amd64/gen/Makefile.inc 230429 2012-01-21 18:00:28Z kib $ +Makefile.incl 230429 2012-01-21 18:00:28Z kib $ SRCS+= _setjmp.S _set_tp.c rfork_thread.S setjmp.S sigsetjmp.S \ fabs.S getcontextx.c \ diff --git a/src/lib/libc_bsd/amd64/stdlib/Makefile.inc b/src/lib/libc_bsd/amd64/stdlib/Makefile.inc index 5b91104..3d49bfb 100644 --- a/src/lib/libc_bsd/amd64/stdlib/Makefile.inc +++ b/src/lib/libc_bsd/amd64/stdlib/Makefile.inc @@ -1,4 +1,4 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/amd64/stdlib/Makefile.inc 168336 2007-04-04 01:19:54Z jkim $ +Makefile.incl 168336 2007-04-04 01:19:54Z jkim $ MDSRCS+=div.S ldiv.S lldiv.S diff --git a/src/lib/libc_bsd/amd64/string/Makefile.inc b/src/lib/libc_bsd/amd64/string/Makefile.inc index 51e6b45..ed27bf7 100644 --- a/src/lib/libc_bsd/amd64/string/Makefile.inc +++ b/src/lib/libc_bsd/amd64/string/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/amd64/string/Makefile.inc 224246 2011-07-21 16:32:13Z gnn $ +Makefile.incl 224246 2011-07-21 16:32:13Z gnn $ MDSRCS+= bcmp.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S \ strcat.S strcmp.S stpcpy.S strcpy.c diff --git a/src/lib/libc_bsd/amd64/sys/Makefile.inc b/src/lib/libc_bsd/amd64/sys/Makefile.inc index 9d56694..8ccbe5a 100644 --- a/src/lib/libc_bsd/amd64/sys/Makefile.inc +++ b/src/lib/libc_bsd/amd64/sys/Makefile.inc @@ -1,5 +1,5 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $FreeBSD: releng/10.2/lib/libc/amd64/sys/Makefile.inc 237434 2012-06-22 07:13:30Z kib $ +Makefile.incl 237434 2012-06-22 07:13:30Z kib $ SRCS+= amd64_get_fsbase.c amd64_get_gsbase.c amd64_set_fsbase.c \ amd64_set_gsbase.c __vdso_gettc.c diff --git a/src/lib/libc_bsd/arm/Makefile.inc b/src/lib/libc_bsd/arm/Makefile.inc index 026eddb..73a7cde 100644 --- a/src/lib/libc_bsd/arm/Makefile.inc +++ b/src/lib/libc_bsd/arm/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/arm/Makefile.inc 245655 2013-01-19 05:33:55Z andrew $ +Makefile.incl 245655 2013-01-19 05:33:55Z andrew $ # # Machine dependent definitions for the arm architecture. # @@ -13,6 +13,6 @@ # This contains the symbols that were removed when moving to the ARM EABI SYM_MAPS+=${.CURDIR}/arm/Symbol_oabi.map .else -.include "${.CURDIR}/arm/aeabi/Makefile.inc" +Makefile.incl" .endif diff --git a/src/lib/libc_bsd/arm/aeabi/Makefile.inc b/src/lib/libc_bsd/arm/aeabi/Makefile.inc index c0da0a6..f08ef48 100644 --- a/src/lib/libc_bsd/arm/aeabi/Makefile.inc +++ b/src/lib/libc_bsd/arm/aeabi/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/arm/aeabi/Makefile.inc 273471 2014-10-22 13:50:38Z andrew $ +Makefile.incl 273471 2014-10-22 13:50:38Z andrew $ .PATH: ${.CURDIR}/arm/aeabi diff --git a/src/lib/libc_bsd/arm/gen/Makefile.inc b/src/lib/libc_bsd/arm/gen/Makefile.inc index 12bf6df..5639c08 100644 --- a/src/lib/libc_bsd/arm/gen/Makefile.inc +++ b/src/lib/libc_bsd/arm/gen/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/arm/gen/Makefile.inc 266370 2014-05-17 22:19:16Z ian $ +Makefile.incl 266370 2014-05-17 22:19:16Z ian $ SRCS+= _ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \ getcontextx.c infinity.c ldexp.c makecontext.c \ diff --git a/src/lib/libc_bsd/arm/string/Makefile.inc b/src/lib/libc_bsd/arm/string/Makefile.inc index 3dc8869..15b9d2c 100644 --- a/src/lib/libc_bsd/arm/string/Makefile.inc +++ b/src/lib/libc_bsd/arm/string/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/arm/string/Makefile.inc 229368 2012-01-03 07:14:01Z ed $ +Makefile.incl 229368 2012-01-03 07:14:01Z ed $ MDSRCS+=bcmp.c bcopy.S bzero.S ffs.S memchr.c memcmp.S memcpy.S \ memmove.S memset.S strcat.c strchr.c strcmp.S strcpy.c strlen.S \ diff --git a/src/lib/libc_bsd/arm/sys/Makefile.inc b/src/lib/libc_bsd/arm/sys/Makefile.inc index 4e5d4bc..1e6da65 100644 --- a/src/lib/libc_bsd/arm/sys/Makefile.inc +++ b/src/lib/libc_bsd/arm/sys/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/arm/sys/Makefile.inc 246117 2013-01-30 12:48:16Z kib $ +Makefile.incl 246117 2013-01-30 12:48:16Z kib $ SRCS+= __vdso_gettc.c diff --git a/src/lib/libc_bsd/capability/Makefile.inc b/src/lib/libc_bsd/capability/Makefile.inc index 9337ea9..d2e0aba 100644 --- a/src/lib/libc_bsd/capability/Makefile.inc +++ b/src/lib/libc_bsd/capability/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/capability/Makefile.inc 257771 2013-11-06 23:59:19Z pjd $ +Makefile.incl 257771 2013-11-06 23:59:19Z pjd $ # capability sources .PATH: ${.CURDIR}/../../sys/kern ${.CURDIR}/capability diff --git a/src/lib/libc_bsd/compat-43/Makefile.inc b/src/lib/libc_bsd/compat-43/Makefile.inc index 2508fab..4496f9f 100644 --- a/src/lib/libc_bsd/compat-43/Makefile.inc +++ b/src/lib/libc_bsd/compat-43/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/2/93 -# $FreeBSD: releng/10.2/lib/libc/compat-43/Makefile.inc 211774 2010-08-24 20:54:43Z imp $ +Makefile.incl 211774 2010-08-24 20:54:43Z imp $ # compat-43 sources .PATH: ${.CURDIR}/${LIBC_ARCH}/compat-43 ${.CURDIR}/compat-43 diff --git a/src/lib/libc_bsd/db/Makefile.inc b/src/lib/libc_bsd/db/Makefile.inc index 10cf602..ed0f993 100644 --- a/src/lib/libc_bsd/db/Makefile.inc +++ b/src/lib/libc_bsd/db/Makefile.inc @@ -1,13 +1,13 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 2/21/94 -# $FreeBSD: releng/10.2/lib/libc/db/Makefile.inc 156613 2006-03-13 01:15:01Z deischen $ +Makefile.incl 156613 2006-03-13 01:15:01Z deischen $ # CFLAGS+=-D__DBINTERFACE_PRIVATE -.include "${.CURDIR}/db/btree/Makefile.inc" -.include "${.CURDIR}/db/db/Makefile.inc" -.include "${.CURDIR}/db/hash/Makefile.inc" -.include "${.CURDIR}/db/man/Makefile.inc" -.include "${.CURDIR}/db/mpool/Makefile.inc" -.include "${.CURDIR}/db/recno/Makefile.inc" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" +Makefile.incl" SYM_MAPS+=${.CURDIR}/db/Symbol.map diff --git a/src/lib/libc_bsd/db/btree/Makefile.inc b/src/lib/libc_bsd/db/btree/Makefile.inc index ab39192..3f4131d 100644 --- a/src/lib/libc_bsd/db/btree/Makefile.inc +++ b/src/lib/libc_bsd/db/btree/Makefile.inc @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 7/14/94 -# $FreeBSD: releng/10.2/lib/libc/db/btree/Makefile.inc 107052 2002-11-18 09:50:57Z ru $ +Makefile.incl 107052 2002-11-18 09:50:57Z ru $ .PATH: ${.CURDIR}/db/btree diff --git a/src/lib/libc_bsd/db/db/Makefile.inc b/src/lib/libc_bsd/db/db/Makefile.inc index b9de41b..21cd9a9 100644 --- a/src/lib/libc_bsd/db/db/Makefile.inc +++ b/src/lib/libc_bsd/db/db/Makefile.inc @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/db/db/Makefile.inc 107052 2002-11-18 09:50:57Z ru $ +Makefile.incl 107052 2002-11-18 09:50:57Z ru $ .PATH: ${.CURDIR}/db/db diff --git a/src/lib/libc_bsd/db/hash/Makefile.inc b/src/lib/libc_bsd/db/hash/Makefile.inc index e77a67e..fa3035d 100644 --- a/src/lib/libc_bsd/db/hash/Makefile.inc +++ b/src/lib/libc_bsd/db/hash/Makefile.inc @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/db/hash/Makefile.inc 107052 2002-11-18 09:50:57Z ru $ +Makefile.incl 107052 2002-11-18 09:50:57Z ru $ .PATH: ${.CURDIR}/db/hash diff --git a/src/lib/libc_bsd/db/man/Makefile.inc b/src/lib/libc_bsd/db/man/Makefile.inc index 51f99e7..a0200a7 100644 --- a/src/lib/libc_bsd/db/man/Makefile.inc +++ b/src/lib/libc_bsd/db/man/Makefile.inc @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/db/man/Makefile.inc 107052 2002-11-18 09:50:57Z ru $ +Makefile.incl 107052 2002-11-18 09:50:57Z ru $ .PATH: ${.CURDIR}/db/man diff --git a/src/lib/libc_bsd/db/mpool/Makefile.inc b/src/lib/libc_bsd/db/mpool/Makefile.inc index 4c07ce6..f437c8a 100644 --- a/src/lib/libc_bsd/db/mpool/Makefile.inc +++ b/src/lib/libc_bsd/db/mpool/Makefile.inc @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/db/mpool/Makefile.inc 190498 2009-03-28 07:31:02Z delphij $ +Makefile.incl 190498 2009-03-28 07:31:02Z delphij $ .PATH: ${.CURDIR}/db/mpool diff --git a/src/lib/libc_bsd/db/recno/Makefile.inc b/src/lib/libc_bsd/db/recno/Makefile.inc index cf4ecab..f4505e6 100644 --- a/src/lib/libc_bsd/db/recno/Makefile.inc +++ b/src/lib/libc_bsd/db/recno/Makefile.inc @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/db/recno/Makefile.inc 107052 2002-11-18 09:50:57Z ru $ +Makefile.incl 107052 2002-11-18 09:50:57Z ru $ .PATH: ${.CURDIR}/db/recno diff --git a/src/lib/libc_bsd/gdtoa/Makefile.inc b/src/lib/libc_bsd/gdtoa/Makefile.inc index cd9a169..bd4ebdb 100644 --- a/src/lib/libc_bsd/gdtoa/Makefile.inc +++ b/src/lib/libc_bsd/gdtoa/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/gdtoa/Makefile.inc 178140 2008-04-12 03:11:36Z das $ +Makefile.incl 178140 2008-04-12 03:11:36Z das $ # netlib gdtoa sources .PATH: ${.CURDIR}/gdtoa diff --git a/src/lib/libc_bsd/gen/Makefile.inc b/src/lib/libc_bsd/gen/Makefile.inc index 548312d..8f1ded9 100644 --- a/src/lib/libc_bsd/gen/Makefile.inc +++ b/src/lib/libc_bsd/gen/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: releng/10.2/lib/libc/gen/Makefile.inc 277317 2015-01-18 11:54:20Z kib $ +Makefile.incl 277317 2015-01-18 11:54:20Z kib $ # machine-independent gen sources .PATH: ${.CURDIR}/${LIBC_ARCH}/gen ${.CURDIR}/gen @@ -166,7 +166,7 @@ SYM_MAPS+=${.CURDIR}/gen/Symbol.map # machine-dependent gen sources -.sinclude "${.CURDIR}/${LIBC_ARCH}/gen/Makefile.inc" +Makefile.incl" MAN+= alarm.3 \ arc4random.3 \ diff --git a/src/lib/libc_bsd/gmon/Makefile.inc b/src/lib/libc_bsd/gmon/Makefile.inc index 1a7f815..1bca8ce 100644 --- a/src/lib/libc_bsd/gmon/Makefile.inc +++ b/src/lib/libc_bsd/gmon/Makefile.inc @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/gmon/Makefile.inc 163739 2006-10-28 13:34:35Z bde $ +Makefile.incl 163739 2006-10-28 13:34:35Z bde $ # gmon sources .PATH: ${.CURDIR}/gmon diff --git a/src/lib/libc_bsd/i386/Makefile.inc b/src/lib/libc_bsd/i386/Makefile.inc index ac13975..09aed1d 100644 --- a/src/lib/libc_bsd/i386/Makefile.inc +++ b/src/lib/libc_bsd/i386/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/i386/Makefile.inc 174204 2007-12-03 07:17:33Z das $ +Makefile.incl 174204 2007-12-03 07:17:33Z das $ # Long double is 80 bits GDTOASRCS+=strtorx.c diff --git a/src/lib/libc_bsd/i386/gen/Makefile.inc b/src/lib/libc_bsd/i386/gen/Makefile.inc index 834e76f..b277347 100644 --- a/src/lib/libc_bsd/i386/gen/Makefile.inc +++ b/src/lib/libc_bsd/i386/gen/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/i386/gen/Makefile.inc 230429 2012-01-21 18:00:28Z kib $ +Makefile.incl 230429 2012-01-21 18:00:28Z kib $ SRCS+= _ctx_start.S _setjmp.S _set_tp.c fabs.S \ flt_rounds.c getcontextx.c infinity.c ldexp.c makecontext.c \ diff --git a/src/lib/libc_bsd/i386/stdlib/Makefile.inc b/src/lib/libc_bsd/i386/stdlib/Makefile.inc index f0aeac6..32e6b0b 100644 --- a/src/lib/libc_bsd/i386/stdlib/Makefile.inc +++ b/src/lib/libc_bsd/i386/stdlib/Makefile.inc @@ -1,4 +1,4 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/i386/stdlib/Makefile.inc 194688 2009-06-23 09:04:59Z ed $ +Makefile.incl 194688 2009-06-23 09:04:59Z ed $ MDSRCS+=div.S ldiv.S diff --git a/src/lib/libc_bsd/i386/string/Makefile.inc b/src/lib/libc_bsd/i386/string/Makefile.inc index a992648..00b602a 100644 --- a/src/lib/libc_bsd/i386/string/Makefile.inc +++ b/src/lib/libc_bsd/i386/string/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/i386/string/Makefile.inc 229368 2012-01-03 07:14:01Z ed $ +Makefile.incl 229368 2012-01-03 07:14:01Z ed $ MDSRCS+=bcmp.S bcopy.S bzero.S ffs.S memchr.S memcmp.S memcpy.S memmove.S \ memset.S strcat.S strchr.S strcmp.S strcpy.S strncmp.S strrchr.S \ diff --git a/src/lib/libc_bsd/i386/sys/Makefile.inc b/src/lib/libc_bsd/i386/sys/Makefile.inc index 877dbbf..52c6339 100644 --- a/src/lib/libc_bsd/i386/sys/Makefile.inc +++ b/src/lib/libc_bsd/i386/sys/Makefile.inc @@ -1,5 +1,5 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $FreeBSD: releng/10.2/lib/libc/i386/sys/Makefile.inc 237434 2012-06-22 07:13:30Z kib $ +Makefile.incl 237434 2012-06-22 07:13:30Z kib $ .if !defined(COMPAT_32BIT) SRCS+= i386_clr_watch.c i386_set_watch.c i386_vm86.c diff --git a/src/lib/libc_bsd/ia64/Makefile.inc b/src/lib/libc_bsd/ia64/Makefile.inc index 1775f4e..8c7957a 100644 --- a/src/lib/libc_bsd/ia64/Makefile.inc +++ b/src/lib/libc_bsd/ia64/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/ia64/Makefile.inc 174204 2007-12-03 07:17:33Z das $ +Makefile.incl 174204 2007-12-03 07:17:33Z das $ # # Machine dependent definitions for the ia64 architecture. # diff --git a/src/lib/libc_bsd/ia64/gen/Makefile.inc b/src/lib/libc_bsd/ia64/gen/Makefile.inc index baaa4ac..0b12ce2 100644 --- a/src/lib/libc_bsd/ia64/gen/Makefile.inc +++ b/src/lib/libc_bsd/ia64/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/ia64/gen/Makefile.inc 230429 2012-01-21 18:00:28Z kib $ +Makefile.incl 230429 2012-01-21 18:00:28Z kib $ SRCS+= __divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \ __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _mcount.S _set_tp.c \ diff --git a/src/lib/libc_bsd/ia64/string/Makefile.inc b/src/lib/libc_bsd/ia64/string/Makefile.inc index 4c92990..5fdab0f 100644 --- a/src/lib/libc_bsd/ia64/string/Makefile.inc +++ b/src/lib/libc_bsd/ia64/string/Makefile.inc @@ -1,3 +1,3 @@ -# $FreeBSD: releng/10.2/lib/libc/ia64/string/Makefile.inc 67117 2000-10-14 17:01:12Z dfr $ +Makefile.incl 67117 2000-10-14 17:01:12Z dfr $ MDSRCS+= bcopy.S bzero.S ffs.S memcpy.S memmove.S diff --git a/src/lib/libc_bsd/ia64/sys/Makefile.inc b/src/lib/libc_bsd/ia64/sys/Makefile.inc index d0baac3..ff84f1a 100644 --- a/src/lib/libc_bsd/ia64/sys/Makefile.inc +++ b/src/lib/libc_bsd/ia64/sys/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/ia64/sys/Makefile.inc 246117 2013-01-30 12:48:16Z kib $ +Makefile.incl 246117 2013-01-30 12:48:16Z kib $ SRCS+= __vdso_gettc.c diff --git a/src/lib/libc_bsd/iconv/Makefile.inc b/src/lib/libc_bsd/iconv/Makefile.inc index 65c8937..7c8daf9 100644 --- a/src/lib/libc_bsd/iconv/Makefile.inc +++ b/src/lib/libc_bsd/iconv/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/iconv/Makefile.inc 258750 2013-11-29 19:44:30Z gjb $ +Makefile.incl 258750 2013-11-29 19:44:30Z gjb $ # iconv sources .PATH: ${.CURDIR}/iconv diff --git a/src/lib/libc_bsd/inet/Makefile.inc b/src/lib/libc_bsd/inet/Makefile.inc index 383b99a..b85e1cc 100644 --- a/src/lib/libc_bsd/inet/Makefile.inc +++ b/src/lib/libc_bsd/inet/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/inet/Makefile.inc 157049 2006-03-23 16:55:13Z des $ +Makefile.incl 157049 2006-03-23 16:55:13Z des $ # inet sources .PATH: ${.CURDIR}/inet diff --git a/src/lib/libc_bsd/isc/Makefile.inc b/src/lib/libc_bsd/isc/Makefile.inc index f8b9ed7..f5ef9fa 100644 --- a/src/lib/libc_bsd/isc/Makefile.inc +++ b/src/lib/libc_bsd/isc/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/isc/Makefile.inc 156956 2006-03-21 15:37:16Z ume $ +Makefile.incl 156956 2006-03-21 15:37:16Z ume $ # isc sources .PATH: ${.CURDIR}/isc diff --git a/src/lib/libc_bsd/locale/Makefile.inc b/src/lib/libc_bsd/locale/Makefile.inc index a2c8c38..74107e0 100644 --- a/src/lib/libc_bsd/locale/Makefile.inc +++ b/src/lib/libc_bsd/locale/Makefile.inc @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/locale/Makefile.inc 251314 2013-06-03 17:17:56Z ed $ +Makefile.incl 251314 2013-06-03 17:17:56Z ed $ # locale sources .PATH: ${.CURDIR}/${LIBC_ARCH}/locale ${.CURDIR}/locale diff --git a/src/lib/libc_bsd/md/Makefile.inc b/src/lib/libc_bsd/md/Makefile.inc index ffbc983..55c4b9a 100644 --- a/src/lib/libc_bsd/md/Makefile.inc +++ b/src/lib/libc_bsd/md/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/md/Makefile.inc 270837 2014-08-30 09:55:38Z ume $ +Makefile.incl 270837 2014-08-30 09:55:38Z ume $ .PATH: ${.CURDIR}/../libmd diff --git a/src/lib/libc_bsd/mips/Makefile.inc b/src/lib/libc_bsd/mips/Makefile.inc index cc8c915..dd6e234 100644 --- a/src/lib/libc_bsd/mips/Makefile.inc +++ b/src/lib/libc_bsd/mips/Makefile.inc @@ -1,5 +1,5 @@ # $NetBSD: Makefile.inc,v 1.7 2005/09/17 11:49:39 tsutsui Exp $ -# $FreeBSD: releng/10.2/lib/libc/mips/Makefile.inc 209233 2010-06-16 14:13:36Z jchandra $ +Makefile.incl 209233 2010-06-16 14:13:36Z jchandra $ CFLAGS+=-DSOFTFLOAT diff --git a/src/lib/libc_bsd/mips/gdtoa/Makefile.inc b/src/lib/libc_bsd/mips/gdtoa/Makefile.inc index 38d91ad..e0ff766 100644 --- a/src/lib/libc_bsd/mips/gdtoa/Makefile.inc +++ b/src/lib/libc_bsd/mips/gdtoa/Makefile.inc @@ -1,4 +1,4 @@ # $NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $ -# $FreeBSD: releng/10.2/lib/libc/mips/gdtoa/Makefile.inc 178580 2008-04-26 12:08:02Z imp $ +Makefile.incl 178580 2008-04-26 12:08:02Z imp $ SRCS+= strtof.c diff --git a/src/lib/libc_bsd/mips/gen/Makefile.inc b/src/lib/libc_bsd/mips/gen/Makefile.inc index d586bb6..9043be9 100644 --- a/src/lib/libc_bsd/mips/gen/Makefile.inc +++ b/src/lib/libc_bsd/mips/gen/Makefile.inc @@ -1,5 +1,5 @@ # $NetBSD: Makefile.inc,v 1.27 2005/10/07 17:16:40 tsutsui Exp $ -# $FreeBSD: releng/10.2/lib/libc/mips/gen/Makefile.inc 230429 2012-01-21 18:00:28Z kib $ +Makefile.incl 230429 2012-01-21 18:00:28Z kib $ SRCS+= infinity.c fabs.c ldexp.c diff --git a/src/lib/libc_bsd/mips/net/Makefile.inc b/src/lib/libc_bsd/mips/net/Makefile.inc index 9969ff4..b5e866d 100644 --- a/src/lib/libc_bsd/mips/net/Makefile.inc +++ b/src/lib/libc_bsd/mips/net/Makefile.inc @@ -1,4 +1,4 @@ # $NetBSD: Makefile.inc,v 1.3 2003/08/01 17:03:51 lukem Exp $ -# $FreeBSD: releng/10.2/lib/libc/mips/net/Makefile.inc 178580 2008-04-26 12:08:02Z imp $ +Makefile.incl 178580 2008-04-26 12:08:02Z imp $ SRCS+= htonl.S ntohl.S htons.S ntohs.S diff --git a/src/lib/libc_bsd/mips/string/Makefile.inc b/src/lib/libc_bsd/mips/string/Makefile.inc index dcef5ee..b7c49fc 100644 --- a/src/lib/libc_bsd/mips/string/Makefile.inc +++ b/src/lib/libc_bsd/mips/string/Makefile.inc @@ -1,5 +1,5 @@ # $NetBSD: Makefile.inc,v 1.2 2000/10/10 21:51:54 jeffs Exp $ -# $FreeBSD: releng/10.2/lib/libc/mips/string/Makefile.inc 229368 2012-01-03 07:14:01Z ed $ +Makefile.incl 229368 2012-01-03 07:14:01Z ed $ SRCS+= bcmp.S bcopy.S bzero.S ffs.S memchr.c memcmp.c memset.c \ memcpy.S memmove.S \ diff --git a/src/lib/libc_bsd/mips/sys/Makefile.inc b/src/lib/libc_bsd/mips/sys/Makefile.inc index 00d5c50..a9fa3f7 100644 --- a/src/lib/libc_bsd/mips/sys/Makefile.inc +++ b/src/lib/libc_bsd/mips/sys/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/mips/sys/Makefile.inc 246117 2013-01-30 12:48:16Z kib $ +Makefile.incl 246117 2013-01-30 12:48:16Z kib $ SRCS+= __vdso_gettc.c diff --git a/src/lib/libc_bsd/nameser/Makefile.inc b/src/lib/libc_bsd/nameser/Makefile.inc index 58a5f14..3d9ca20 100644 --- a/src/lib/libc_bsd/nameser/Makefile.inc +++ b/src/lib/libc_bsd/nameser/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/nameser/Makefile.inc 157049 2006-03-23 16:55:13Z des $ +Makefile.incl 157049 2006-03-23 16:55:13Z des $ # nameser sources .PATH: ${.CURDIR}/nameser diff --git a/src/lib/libc_bsd/net/Makefile.inc b/src/lib/libc_bsd/net/Makefile.inc index 3371629..8dddc77 100644 --- a/src/lib/libc_bsd/net/Makefile.inc +++ b/src/lib/libc_bsd/net/Makefile.inc @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: releng/10.2/lib/libc/net/Makefile.inc 237402 2012-06-21 15:47:06Z obrien $ +Makefile.incl 237402 2012-06-21 15:47:06Z obrien $ # machine-independent net sources .PATH: ${.CURDIR}/net diff --git a/src/lib/libc_bsd/nls/Makefile.inc b/src/lib/libc_bsd/nls/Makefile.inc index bac1ff4..ab8e922 100644 --- a/src/lib/libc_bsd/nls/Makefile.inc +++ b/src/lib/libc_bsd/nls/Makefile.inc @@ -1,5 +1,5 @@ # from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $ -# $FreeBSD: releng/10.2/lib/libc/nls/Makefile.inc 244757 2012-12-28 01:23:12Z delphij $ +Makefile.incl 244757 2012-12-28 01:23:12Z delphij $ .PATH: ${.CURDIR}/nls diff --git a/src/lib/libc_bsd/posix1e/Makefile.inc b/src/lib/libc_bsd/posix1e/Makefile.inc index 46fb12e..b09921e 100644 --- a/src/lib/libc_bsd/posix1e/Makefile.inc +++ b/src/lib/libc_bsd/posix1e/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/posix1e/Makefile.inc 209147 2010-06-14 02:26:13Z kientzle $ +Makefile.incl 209147 2010-06-14 02:26:13Z kientzle $ .PATH: ${.CURDIR}/posix1e diff --git a/src/lib/libc_bsd/powerpc/Makefile.inc b/src/lib/libc_bsd/powerpc/Makefile.inc index 099a518..e8e8f2c 100644 --- a/src/lib/libc_bsd/powerpc/Makefile.inc +++ b/src/lib/libc_bsd/powerpc/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/powerpc/Makefile.inc 246117 2013-01-30 12:48:16Z kib $ +Makefile.incl 246117 2013-01-30 12:48:16Z kib $ SRCS+= __vdso_gettc.c diff --git a/src/lib/libc_bsd/powerpc/gen/Makefile.inc b/src/lib/libc_bsd/powerpc/gen/Makefile.inc index e0f4129..0800d40 100644 --- a/src/lib/libc_bsd/powerpc/gen/Makefile.inc +++ b/src/lib/libc_bsd/powerpc/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/powerpc/gen/Makefile.inc 235929 2012-05-24 20:12:46Z marcel $ +Makefile.incl 235929 2012-05-24 20:12:46Z marcel $ SRCS += _ctx_start.S eabi.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ fpgetsticky.c fpsetmask.c fpsetround.c getcontextx.c \ diff --git a/src/lib/libc_bsd/powerpc/sys/Makefile.inc b/src/lib/libc_bsd/powerpc/sys/Makefile.inc index 7b6463b..2ddbb59 100644 --- a/src/lib/libc_bsd/powerpc/sys/Makefile.inc +++ b/src/lib/libc_bsd/powerpc/sys/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/powerpc/sys/Makefile.inc 184789 2008-11-09 10:45:13Z ed $ +Makefile.incl 184789 2008-11-09 10:45:13Z ed $ MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S diff --git a/src/lib/libc_bsd/powerpc64/Makefile.inc b/src/lib/libc_bsd/powerpc64/Makefile.inc index 3e36093..2a61c88 100644 --- a/src/lib/libc_bsd/powerpc64/Makefile.inc +++ b/src/lib/libc_bsd/powerpc64/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/powerpc64/Makefile.inc 246117 2013-01-30 12:48:16Z kib $ +Makefile.incl 246117 2013-01-30 12:48:16Z kib $ SRCS+= __vdso_gettc.c diff --git a/src/lib/libc_bsd/powerpc64/gen/Makefile.inc b/src/lib/libc_bsd/powerpc64/gen/Makefile.inc index 434c53b..faf7fa3 100644 --- a/src/lib/libc_bsd/powerpc64/gen/Makefile.inc +++ b/src/lib/libc_bsd/powerpc64/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/powerpc64/gen/Makefile.inc 230429 2012-01-21 18:00:28Z kib $ +Makefile.incl 230429 2012-01-21 18:00:28Z kib $ SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ fpgetsticky.c fpsetmask.c fpsetround.c getcontextx.c \ diff --git a/src/lib/libc_bsd/powerpc64/sys/Makefile.inc b/src/lib/libc_bsd/powerpc64/sys/Makefile.inc index a08081e..8e51ed5 100644 --- a/src/lib/libc_bsd/powerpc64/sys/Makefile.inc +++ b/src/lib/libc_bsd/powerpc64/sys/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/powerpc64/sys/Makefile.inc 209878 2010-07-10 14:45:03Z nwhitehorn $ +Makefile.incl 209878 2010-07-10 14:45:03Z nwhitehorn $ MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S diff --git a/src/lib/libc_bsd/quad/Makefile.inc b/src/lib/libc_bsd/quad/Makefile.inc index dbb5367..52ec7c2 100644 --- a/src/lib/libc_bsd/quad/Makefile.inc +++ b/src/lib/libc_bsd/quad/Makefile.inc @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/quad/Makefile.inc 245644 2013-01-19 02:33:57Z andrew $ +Makefile.incl 245644 2013-01-19 02:33:57Z andrew $ # Quad support, if needed .PATH: ${.CURDIR}/${LIBC_ARCH}/quad ${.CURDIR}/quad diff --git a/src/lib/libc_bsd/regex/Makefile.inc b/src/lib/libc_bsd/regex/Makefile.inc index a8480b9..76aa342 100644 --- a/src/lib/libc_bsd/regex/Makefile.inc +++ b/src/lib/libc_bsd/regex/Makefile.inc @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/regex/Makefile.inc 156613 2006-03-13 01:15:01Z deischen $ +Makefile.incl 156613 2006-03-13 01:15:01Z deischen $ # regex sources .PATH: ${.CURDIR}/regex diff --git a/src/lib/libc_bsd/resolv/Makefile.inc b/src/lib/libc_bsd/resolv/Makefile.inc index 23b95f5..5aed1ea 100644 --- a/src/lib/libc_bsd/resolv/Makefile.inc +++ b/src/lib/libc_bsd/resolv/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/resolv/Makefile.inc 270838 2014-08-30 10:16:25Z ume $ +Makefile.incl 270838 2014-08-30 10:16:25Z ume $ # resolv sources .PATH: ${.CURDIR}/resolv diff --git a/src/lib/libc_bsd/rpc/Makefile.inc b/src/lib/libc_bsd/rpc/Makefile.inc index 48f6f7b..74bfab8 100644 --- a/src/lib/libc_bsd/rpc/Makefile.inc +++ b/src/lib/libc_bsd/rpc/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile 5.11 (Berkeley) 9/6/90 -# $FreeBSD: releng/10.2/lib/libc/rpc/Makefile.inc 231118 2012-02-07 09:27:07Z dim $ +Makefile.incl 231118 2012-02-07 09:27:07Z dim $ .PATH: ${.CURDIR}/rpc ${.CURDIR}/. SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ diff --git a/src/lib/libc_bsd/softfloat/Makefile.inc b/src/lib/libc_bsd/softfloat/Makefile.inc index ad83b31..3fb59d6 100644 --- a/src/lib/libc_bsd/softfloat/Makefile.inc +++ b/src/lib/libc_bsd/softfloat/Makefile.inc @@ -1,5 +1,5 @@ # $NetBSD: Makefile.inc,v 1.10 2011/07/04 02:53:15 mrg Exp $ -# $FreeBSD: releng/10.2/lib/libc/softfloat/Makefile.inc 230363 2012-01-20 06:16:14Z das $ +Makefile.incl 230363 2012-01-20 06:16:14Z das $ SOFTFLOAT_BITS?=64 .PATH: ${LIBC_ARCH}/softfloat \ diff --git a/src/lib/libc_bsd/sparc64/Makefile.inc b/src/lib/libc_bsd/sparc64/Makefile.inc index da65eae..f2e300d 100644 --- a/src/lib/libc_bsd/sparc64/Makefile.inc +++ b/src/lib/libc_bsd/sparc64/Makefile.inc @@ -1,9 +1,9 @@ -# $FreeBSD: releng/10.2/lib/libc/sparc64/Makefile.inc 246117 2013-01-30 12:48:16Z kib $ +Makefile.incl 246117 2013-01-30 12:48:16Z kib $ # # Machine dependent definitions for the ultra sparc architecture. # -.include "fpu/Makefile.inc" +Makefile.incl" SRCS+= __vdso_gettc.c diff --git a/src/lib/libc_bsd/sparc64/fpu/Makefile.inc b/src/lib/libc_bsd/sparc64/fpu/Makefile.inc index 9ea515f..185dab1 100644 --- a/src/lib/libc_bsd/sparc64/fpu/Makefile.inc +++ b/src/lib/libc_bsd/sparc64/fpu/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/sparc64/fpu/Makefile.inc 107052 2002-11-18 09:50:57Z ru $ +Makefile.incl 107052 2002-11-18 09:50:57Z ru $ .PATH: ${.CURDIR}/sparc64/fpu diff --git a/src/lib/libc_bsd/sparc64/gen/Makefile.inc b/src/lib/libc_bsd/sparc64/gen/Makefile.inc index 9f8e65a..67bae35 100644 --- a/src/lib/libc_bsd/sparc64/gen/Makefile.inc +++ b/src/lib/libc_bsd/sparc64/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/sparc64/gen/Makefile.inc 230429 2012-01-21 18:00:28Z kib $ +Makefile.incl 230429 2012-01-21 18:00:28Z kib $ SRCS+= _ctx_start.S _setjmp.S fabs.S fixunsdfsi.S flt_rounds.c fpgetmask.c \ fpgetround.c fpgetsticky.c fpsetmask.c fpsetround.c \ diff --git a/src/lib/libc_bsd/sparc64/string/Makefile.inc b/src/lib/libc_bsd/sparc64/string/Makefile.inc index 8202d55..ee3445c 100644 --- a/src/lib/libc_bsd/sparc64/string/Makefile.inc +++ b/src/lib/libc_bsd/sparc64/string/Makefile.inc @@ -1 +1 @@ -# $FreeBSD: releng/10.2/lib/libc/sparc64/string/Makefile.inc 85518 2001-10-26 05:40:07Z jake $ +Makefile.incl 85518 2001-10-26 05:40:07Z jake $ diff --git a/src/lib/libc_bsd/sparc64/sys/Makefile.inc b/src/lib/libc_bsd/sparc64/sys/Makefile.inc index c01b331..8edd60b 100644 --- a/src/lib/libc_bsd/sparc64/sys/Makefile.inc +++ b/src/lib/libc_bsd/sparc64/sys/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/sparc64/sys/Makefile.inc 279258 2015-02-24 22:28:44Z marius $ +Makefile.incl 279258 2015-02-24 22:28:44Z marius $ SRCS+= __sparc_sigtramp_setup.c \ __sparc_utrap.c \ diff --git a/src/lib/libc_bsd/stdio/Makefile.inc b/src/lib/libc_bsd/stdio/Makefile.inc index 1b15449..913182d 100644 --- a/src/lib/libc_bsd/stdio/Makefile.inc +++ b/src/lib/libc_bsd/stdio/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 4/17/94 -# $FreeBSD: releng/10.2/lib/libc/stdio/Makefile.inc 254151 2013-08-09 17:24:23Z jilles $ +Makefile.incl 254151 2013-08-09 17:24:23Z jilles $ # stdio sources .PATH: ${.CURDIR}/stdio diff --git a/src/lib/libc_bsd/stdlib/Makefile.inc b/src/lib/libc_bsd/stdlib/Makefile.inc index ec71c3d..18ed473 100644 --- a/src/lib/libc_bsd/stdlib/Makefile.inc +++ b/src/lib/libc_bsd/stdlib/Makefile.inc @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.3 (Berkeley) 2/4/95 -# $FreeBSD: releng/10.2/lib/libc/stdlib/Makefile.inc 237573 2012-06-25 21:51:40Z issyl0 $ +Makefile.incl 237573 2012-06-25 21:51:40Z issyl0 $ # machine-independent stdlib sources .PATH: ${.CURDIR}/${LIBC_ARCH}/stdlib ${.CURDIR}/stdlib @@ -16,7 +16,7 @@ SYM_MAPS+= ${.CURDIR}/stdlib/Symbol.map # machine-dependent stdlib sources -.sinclude "${.CURDIR}/${LIBC_ARCH}/stdlib/Makefile.inc" +Makefile.incl" MAN+= a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 \ atoi.3 atol.3 at_quick_exit.3 bsearch.3 \ diff --git a/src/lib/libc_bsd/stdlib/jemalloc/Makefile.inc b/src/lib/libc_bsd/stdlib/jemalloc/Makefile.inc index 15f66e3..d18eb4a 100644 --- a/src/lib/libc_bsd/stdlib/jemalloc/Makefile.inc +++ b/src/lib/libc_bsd/stdlib/jemalloc/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/stdlib/jemalloc/Makefile.inc 234370 2012-04-17 07:22:14Z jasone $ +Makefile.incl 234370 2012-04-17 07:22:14Z jasone $ .PATH: ${.CURDIR}/stdlib/jemalloc diff --git a/src/lib/libc_bsd/stdtime/Makefile.inc b/src/lib/libc_bsd/stdtime/Makefile.inc index 3e89d37..f6a5f38 100644 --- a/src/lib/libc_bsd/stdtime/Makefile.inc +++ b/src/lib/libc_bsd/stdtime/Makefile.inc @@ -1,5 +1,5 @@ # Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp -# $FreeBSD: releng/10.2/lib/libc/stdtime/Makefile.inc 248672 2013-03-24 01:35:37Z dim $ +Makefile.incl 248672 2013-03-24 01:35:37Z dim $ .PATH: ${.CURDIR}/stdtime ${.CURDIR}/../locale \ ${.CURDIR}/../../contrib/tzcode/stdtime diff --git a/src/lib/libc_bsd/string/Makefile.inc b/src/lib/libc_bsd/string/Makefile.inc index e7416bb..2cdcbec 100644 --- a/src/lib/libc_bsd/string/Makefile.inc +++ b/src/lib/libc_bsd/string/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: releng/10.2/lib/libc/string/Makefile.inc 281570 2015-04-16 00:24:21Z allanjude $ +Makefile.incl 281570 2015-04-16 00:24:21Z allanjude $ .PATH: ${.CURDIR}/${LIBC_ARCH}/string ${.CURDIR}/string @@ -26,7 +26,7 @@ # machine-dependent string sources -.sinclude "${.CURDIR}/${LIBC_ARCH}/string/Makefile.inc" +Makefile.incl" MAN+= bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \ memcmp.3 memcpy.3 memmem.3 memmove.3 memset.3 strcasecmp.3 strcat.3 \ diff --git a/src/lib/libc_bsd/sys/Makefile.inc b/src/lib/libc_bsd/sys/Makefile.inc index 23d9e6b..6628e85 100644 --- a/src/lib/libc_bsd/sys/Makefile.inc +++ b/src/lib/libc_bsd/sys/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: releng/10.2/lib/libc/sys/Makefile.inc 281981 2015-04-25 08:14:08Z kib $ +Makefile.incl 281981 2015-04-25 08:14:08Z kib $ # sys sources .PATH: ${.CURDIR}/${LIBC_ARCH}/sys ${.CURDIR}/sys @@ -13,7 +13,7 @@ # MDASM names override the default syscall names in MIASM. # NOASM will prevent the default syscall code from being generated. # -.sinclude "${.CURDIR}/${LIBC_ARCH}/sys/Makefile.inc" +Makefile.incl" SRCS+= clock_gettime.c gettimeofday.c __vdso_gettimeofday.c NOASM+= clock_gettime.o gettimeofday.o diff --git a/src/lib/libc_bsd/uuid/Makefile.inc b/src/lib/libc_bsd/uuid/Makefile.inc index a295364..79261fe 100644 --- a/src/lib/libc_bsd/uuid/Makefile.inc +++ b/src/lib/libc_bsd/uuid/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: releng/10.2/lib/libc/uuid/Makefile.inc 181743 2008-08-14 22:23:16Z emax $ +Makefile.incl 181743 2008-08-14 22:23:16Z emax $ # DCE 1.1 UUID implementation sources diff --git a/src/lib/libc_bsd/xdr/Makefile.inc b/src/lib/libc_bsd/xdr/Makefile.inc index bed6215..1b0b221 100644 --- a/src/lib/libc_bsd/xdr/Makefile.inc +++ b/src/lib/libc_bsd/xdr/Makefile.inc @@ -1,5 +1,5 @@ # @(#)Makefile 5.11 (Berkeley) 9/6/90 -# $FreeBSD: releng/10.2/lib/libc/xdr/Makefile.inc 223877 2011-07-09 07:43:56Z kevlo $ +Makefile.incl 223877 2011-07-09 07:43:56Z kevlo $ .PATH: ${.CURDIR}/xdr ${.CURDIR}/. SRCS+= xdr.c xdr_array.c xdr_float.c xdr_mem.c \ diff --git a/src/lib/libc_bsd/yp/Makefile.inc b/src/lib/libc_bsd/yp/Makefile.inc index 9ef7551..9e55e59 100644 --- a/src/lib/libc_bsd/yp/Makefile.inc +++ b/src/lib/libc_bsd/yp/Makefile.inc @@ -1,5 +1,5 @@ # from: @(#)Makefile.inc 5.3 (Berkeley) 2/20/91 -# $FreeBSD: releng/10.2/lib/libc/yp/Makefile.inc 231118 2012-02-07 09:27:07Z dim $ +Makefile.incl 231118 2012-02-07 09:27:07Z dim $ # yp sources .PATH: ${.CURDIR}/yp diff --git a/src/lib/libc_old/Makefile b/src/lib/libc_old/Makefile index 214d26e..ecb308a 100644 --- a/src/lib/libc_old/Makefile +++ b/src/lib/libc_old/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Objects OBJS = diff --git a/src/lib/libc_old/gen/Makefile b/src/lib/libc_old/gen/Makefile index ea65153..b17ac0e 100644 --- a/src/lib/libc_old/gen/Makefile +++ b/src/lib/libc_old/gen/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl #Objects OBJS = setprogname.o getprogname.o errlst.o err.o diff --git a/src/lib/libc_old/generic/Makefile b/src/lib/libc_old/generic/Makefile index bf2828b..a9c8407 100644 --- a/src/lib/libc_old/generic/Makefile +++ b/src/lib/libc_old/generic/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl #Objects OBJS = unlink.o getcwd.o mkdir.o chdir.o diff --git a/src/lib/libc_old/locale/Makefile b/src/lib/libc_old/locale/Makefile index 2699255..92003cc 100644 --- a/src/lib/libc_old/locale/Makefile +++ b/src/lib/libc_old/locale/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl #Objects OBJS = mbrtowc.o srune.o none.o wcrtomb.o table.o runetype.o toupper.o tolower.o diff --git a/src/lib/libc_old/math/Makefile b/src/lib/libc_old/math/Makefile index d630e0b..a5a85b4 100644 --- a/src/lib/libc_old/math/Makefile +++ b/src/lib/libc_old/math/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl #Objects OBJS = atan.o sqrt.o diff --git a/src/lib/libc_old/quad/Makefile b/src/lib/libc_old/quad/Makefile index d312e59..bcebc54 100644 --- a/src/lib/libc_old/quad/Makefile +++ b/src/lib/libc_old/quad/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl #Objects OBJS = udivdi3.o divdi3.o diff --git a/src/lib/libc_old/stdio/Makefile b/src/lib/libc_old/stdio/Makefile index 29aba64..639ad20 100644 --- a/src/lib/libc_old/stdio/Makefile +++ b/src/lib/libc_old/stdio/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl #Objects OBJS = fprintf.o fseek.o printf.o vsprintf.o fd.o vfprintf.o fopen.o fread.o fwrite.o fgetc.o sprintf.o gets.o fclose.o diff --git a/src/lib/libc_old/stdlib/Makefile b/src/lib/libc_old/stdlib/Makefile index b926368..c10698e 100644 --- a/src/lib/libc_old/stdlib/Makefile +++ b/src/lib/libc_old/stdlib/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl #Objects OBJS = strtol.o atoi.o abs.o exit.o malloc.o rand.o getopt.o diff --git a/src/lib/libc_old/string/Makefile b/src/lib/libc_old/string/Makefile index 912f6bf..4b46d8e 100644 --- a/src/lib/libc_old/string/Makefile +++ b/src/lib/libc_old/string/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl #Objects OBJS = swab.o strstr.o strspn.o strsep.o strpbrk.o strnstr.o strncpy.o strncmp.o strncat.o strmode.o strdup.o strcspn.o strcat.o strchr.o stpcpy.o memchr.o memccpy.o strcasecmp.o rindex.o index.o ffs.o bzero.o bcopy.o bcmp.o memmove.o strrchr.o strlcat.o strlcpy.o strerror.o strtok.o memcpy.o memset.o memcmp.o strlen.o strcmp.o strcasestr.o diff --git a/src/lib/libc_old/sys/Makefile b/src/lib/libc_old/sys/Makefile index a58fddf..359ceb8 100644 --- a/src/lib/libc_old/sys/Makefile +++ b/src/lib/libc_old/sys/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl #Objects OBJS = mpi.o startsde.o mmap.o error.o getuptime.o gettime.o getdrives.o setuid.o setgid.o getuid.o getgid.o exec.o getpid.o fork.o pidstatus.o getpage.o sched.o auth.o execve.o diff --git a/src/lib/libcpp/Makefile b/src/lib/libcpp/Makefile index 1174efa..628f53c 100644 --- a/src/lib/libcpp/Makefile +++ b/src/lib/libcpp/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +Makefile.incl +Makefile.incl # Objects OBJS = libcpp.o diff --git a/src/lib/libedit/Makefile b/src/lib/libedit/Makefile index ab8846e..2fb3355 100644 --- a/src/lib/libedit/Makefile +++ b/src/lib/libedit/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +Makefile.incl +Makefile.incl INCLUDES = -I. -I../../include diff --git a/src/lib/libstdc++/Makefile b/src/lib/libstdc++/Makefile index 9e46279..b756f64 100644 --- a/src/lib/libstdc++/Makefile +++ b/src/lib/libstdc++/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +Makefile.incl +Makefile.incl #Objects OBJS = sinst.o diff --git a/src/lib/objgfx40/Makefile b/src/lib/objgfx40/Makefile index 91adde6..a4cea4a 100644 --- a/src/lib/objgfx40/Makefile +++ b/src/lib/objgfx40/Makefile @@ -1,8 +1,8 @@ # $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $ # Kernel Makefile (C) 2002 The UbixOS Project -include ../../Makefile.inc -include ../Makefile.inc +Makefile.incl +Makefile.incl #Delete Program REMOVE = rm -f diff --git a/src/lib/ubix/Makefile b/src/lib/ubix/Makefile index f4ee182..f2bf4da 100644 --- a/src/lib/ubix/Makefile +++ b/src/lib/ubix/Makefile @@ -2,8 +2,8 @@ # Kernel Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Binary File Name BINARY = none diff --git a/src/lib/ubix_api/Makefile b/src/lib/ubix_api/Makefile index f39d1e7..92ac8d4 100644 --- a/src/lib/ubix_api/Makefile +++ b/src/lib/ubix_api/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Objects OBJS = diff --git a/src/lib/ubix_api/test/Makefile b/src/lib/ubix_api/test/Makefile index 2e9a41b..9e9c4e0 100644 --- a/src/lib/ubix_api/test/Makefile +++ b/src/lib/ubix_api/test/Makefile @@ -2,8 +2,8 @@ # The System Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl #Objects OBJS = test.o diff --git a/src/lib/views/sunlight/Makefile b/src/lib/views/sunlight/Makefile index 123e3ca..54232ae 100644 --- a/src/lib/views/sunlight/Makefile +++ b/src/lib/views/sunlight/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $ # Kernel Makefile (C) 2002 The UbixOS Project -include ../../../Makefile.inc +Makefile.incl #Objects OBJS = sStyle.o sTypes.o vContext.o vButton.o vMenuBar.o vView.o vCanvas.o vDesktop.o vTitleTab.o diff --git a/src/sys/Makefile.inc b/src/sys/Makefile.inc deleted file mode 100644 index 9f10fa9..0000000 --- a/src/sys/Makefile.inc +++ /dev/null @@ -1,4 +0,0 @@ -# $Id: Makefile.inc 113 2016-01-14 00:40:12Z reddawg $ - -INCLUDES = -I${INCLUDE} -CFLAGS = ${KFLAGS} -m32 -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -ffreestanding -O diff --git a/src/sys/Makefile.incl b/src/sys/Makefile.incl new file mode 100644 index 0000000..9f10fa9 --- /dev/null +++ b/src/sys/Makefile.incl @@ -0,0 +1,4 @@ +# $Id: Makefile.inc 113 2016-01-14 00:40:12Z reddawg $ + +INCLUDES = -I${INCLUDE} +CFLAGS = ${KFLAGS} -m32 -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -ffreestanding -O diff --git a/src/sys/armv6/Makefile b/src/sys/armv6/Makefile index f64b709..b4e6ed7 100644 --- a/src/sys/armv6/Makefile +++ b/src/sys/armv6/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 134 2016-01-15 14:50:24Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +Makefile.incl +Makefile.incl # Objects OBJS = schedyield.o kpanic.o timer.o spinlock.o i386_exec.o sys_call_new.o sys_call.o bioscall.o fork.o syscall.o systemtask.o sched.o cpu.o diff --git a/src/sys/boot/arm/uboot/Makefile b/src/sys/boot/arm/uboot/Makefile index 05210b9..31fc3a1 100644 --- a/src/sys/boot/arm/uboot/Makefile +++ b/src/sys/boot/arm/uboot/Makefile @@ -88,7 +88,7 @@ # Always add MI sources .PATH: ${.CURDIR}/../../common -.include "${.CURDIR}/../../common/Makefile.inc" +Makefile.incl" CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I. @@ -100,7 +100,7 @@ # Pull in common loader code .PATH: ${.CURDIR}/../../uboot/common -.include "${.CURDIR}/../../uboot/common/Makefile.inc" +Makefile.incl" CFLAGS+= -I${.CURDIR}/../../uboot/common # U-Boot standalone support library @@ -147,7 +147,7 @@ .if !defined(LOADER_ONLY) .PATH: ${.CURDIR}/../../forth -.include "${.CURDIR}/../../forth/Makefile.inc" +Makefile.incl" # Install loader.rc. FILES+= loader.rc diff --git a/src/sys/compile/Makefile b/src/sys/compile/Makefile index 3703fd1..3723724 100644 --- a/src/sys/compile/Makefile +++ b/src/sys/compile/Makefile @@ -2,8 +2,8 @@ # Kernel Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl #Objects OBJS = null.o diff --git a/src/sys/fs/common/Makefile b/src/sys/fs/common/Makefile index 47633ef..281d340 100644 --- a/src/sys/fs/common/Makefile +++ b/src/sys/fs/common/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 102 2016-01-12 03:59:34Z reddawg $ # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl # Objects OBJS = crc32.o gpt.o diff --git a/src/sys/fs/devfs/Makefile b/src/sys/fs/devfs/Makefile index 0c6806d..afb79e4 100644 --- a/src/sys/fs/devfs/Makefile +++ b/src/sys/fs/devfs/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl # Linker LINKER = ld diff --git a/src/sys/fs/ubixfs/Makefile b/src/sys/fs/ubixfs/Makefile index 18a8203..f5c44f9 100644 --- a/src/sys/fs/ubixfs/Makefile +++ b/src/sys/fs/ubixfs/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl # Objects OBJS = thread.o ubixfs.o directory.o block.o dirCache.o diff --git a/src/sys/fs/ufs/Makefile b/src/sys/fs/ufs/Makefile index 8e0e532..0c554b3 100644 --- a/src/sys/fs/ufs/Makefile +++ b/src/sys/fs/ufs/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl # Objects OBJS = ufs.o ffs.o diff --git a/src/sys/fs/vfs/Makefile b/src/sys/fs/vfs/Makefile index 429b84e..fb5ef9d 100644 --- a/src/sys/fs/vfs/Makefile +++ b/src/sys/fs/vfs/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +include ../../../Makefile.incl +include ../../Makefile.incl # Objects OBJS = mount.o file.o vfs.o diff --git a/src/sys/i386/Makefile b/src/sys/i386/Makefile index 47ab4dc..4eceb09 100644 --- a/src/sys/i386/Makefile +++ b/src/sys/i386/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 202 2016-01-23 15:21:35Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl # Objects OBJS = schedyield.o kpanic.o timer.o spinlock.o i386_exec.o sys_call_new.o sys_call.o syscall.o bioscall.o fork.o systemtask.o sched.o cpu.o trap.o diff --git a/src/sys/include/sys/_types.h b/src/sys/include/sys/_types.h index dbe2141..e0b43be 100644 --- a/src/sys/include/sys/_types.h +++ b/src/sys/include/sys/_types.h @@ -1,66 +1,48 @@ -/***************************************************************************************** - Copyright (c) 2002-2004 The UbixOS Project - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, are - permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this list of - conditions, the following disclaimer and the list of authors. Redistributions in binary - form must reproduce the above copyright notice, this list of conditions, the following - disclaimer and the list of authors in the documentation and/or other materials provided - with the distribution. Neither the name of the UbixOS Project nor the names of its - contributors may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - $Id: _types.h 54 2016-01-11 01:29:55Z reddawg $ - -*****************************************************************************************/ +/*- + * Copyright (c) 2002-2004, 2017 The UbixOS Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this list of + * conditions, the following disclaimer and the list of authors. Redistributions in binary + * form must reproduce the above copyright notice, this list of conditions, the following + * disclaimer and the list of authors in the documentation and/or other materials provided + * with the distribution. Neither the name of the UbixOS Project nor the names of its + * contributors may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #ifndef __TYPES_H #define __TYPES_H -//#include -typedef __signed char __int8_t; -typedef unsigned char __uint8_t; -typedef short __int16_t; -typedef unsigned short __uint16_t; -typedef int __int32_t; -typedef unsigned int __uint32_t; -typedef long long __int64_t; -typedef unsigned long long __uint64_t; +typedef __signed char __int8_t; +typedef unsigned char __uint8_t; +typedef short __int16_t; +typedef unsigned short __uint16_t; +typedef int __int32_t; +typedef unsigned int __uint32_t; +typedef long long __int64_t; +typedef unsigned long long __uint64_t; - -typedef unsigned long __clock_t; -//typedef long __time_t; -typedef __uint32_t __ino_t; -typedef __int32_t __ssize_t; - -/* stat types */ -typedef __uint32_t __dev_t; /* device number */ -typedef __uint16_t __mode_t; -typedef __uint16_t __nlink_t; /* link count */ -typedef __uint32_t __uid_t; -typedef __uint32_t __gid_t; -typedef __int32_t __time_t; -typedef __int64_t __blkcnt_t; /* file block count */ -typedef __uint32_t __blksize_t; /* file block size */ -typedef __uint32_t __fflags_t; /* file flags */ +typedef unsigned long __clock_t; +typedef __uint32_t __ino_t; typedef __int32_t __ssize_t;/* stat types */ +typedef __uint32_t __dev_t;/* device number */ +typedef __uint16_t __mode_t; typedef __uint16_t __nlink_t;/* link count */ +typedef __uint32_t __uid_t; typedef __uint32_t __gid_t; typedef __int32_t __time_t; typedef __int64_t __blkcnt_t;/* file block count */ +typedef __uint32_t __blksize_t;/* file block size */ +typedef __uint32_t __fflags_t;/* file flags */ #endif - -/*** - END - ***/ - diff --git a/src/sys/include/sys/types.h b/src/sys/include/sys/types.h index f8f131b..197b4a6 100644 --- a/src/sys/include/sys/types.h +++ b/src/sys/include/sys/types.h @@ -52,8 +52,8 @@ typedef __uint32_t u_int32_t; typedef __uint64_t u_int64_t; //typedef long long int quad_t; -//typedef __uint64_t quad_t; -typedef __uint32_t quad_t; +typedef __uint64_t quad_t; +//typedef __uint32_t quad_t; typedef unsigned char u_char; typedef unsigned short u_short; diff --git a/src/sys/include/ufs/ufs.h b/src/sys/include/ufs/ufs.h index 8c3da3f..b1fb505 100644 --- a/src/sys/include/ufs/ufs.h +++ b/src/sys/include/ufs/ufs.h @@ -1,5 +1,5 @@ /***************************************************************************************** - Copyright (c) 2002-2004 The UbixOS Project + Copyright (c) 2002-2004, 2017 The UbixOS Project All rights reserved. Redistribution and use in source and binary forms, with or without modification, are @@ -25,7 +25,7 @@ $Id: ufs.h 141 2016-01-17 02:05:18Z reddawg $ -*****************************************************************************************/ + *****************************************************************************************/ #ifndef _UFS_H #define _UFS_H @@ -34,28 +34,26 @@ #include #include - -#define DT_REG 8 -#define MAXNAMLEN 255 -#define ROOTINO ((ino_t)2) -#define DT_DIR 4 -#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */ -#define DEV_BSIZE (1<fs_nindir) +#define DT_REG 8 +#define MAXNAMLEN 255 +#define ROOTINO ((ino_t)2) +#define DT_DIR 4 +#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */ +#define DEV_BSIZE (1<fs_nindir) /* * Cylinder group macros to locate things in cylinder groups. @@ -66,13 +64,10 @@ #define cgimin(fs, c) (cgstart(fs, c) + (fs)->fs_iblkno) /* inode blk */ #define cgsblock(fs, c) (cgstart(fs, c) + (fs)->fs_sblkno) /* super blk */ #define cgtod(fs, c) (cgstart(fs, c) + (fs)->fs_cblkno) /* cg block */ -#define cgstart(fs, c) \ - ((fs)->fs_magic == FS_UFS2_MAGIC ? cgbase(fs, c) : \ - (cgbase(fs, c) + (fs)->fs_old_cgoffset * ((c) & ~((fs)->fs_old_cgmask)))) +#define cgstart(fs, c) ((fs)->fs_magic == FS_UFS2_MAGIC ? cgbase(fs, c) : (cgbase(fs, c) + (fs)->fs_old_cgoffset * ((c) & ~((fs)->fs_old_cgmask)))) - -#define fsbtodb(fs, b) ((daddr_t)(b) << (fs)->fs_fsbtodb) -#define dbtofsb(fs, b) ((b) >> (fs)->fs_fsbtodb) +#define fsbtodb(fs, b) ((daddr_t)(b) << (fs)->fs_fsbtodb) +#define dbtofsb(fs, b) ((b) >> (fs)->fs_fsbtodb) /* * Macros for handling inode numbers: @@ -80,28 +75,15 @@ * inode number to cylinder group number. * inode number to filesystem block address. */ -#define ino_to_cg(fs, x) ((x) / (fs)->fs_ipg) -#define ino_to_fsba(fs, x) \ - ((ufs2_daddr_t)(cgimin(fs, ino_to_cg(fs, x)) + \ - (blkstofrags((fs), (((x) % (fs)->fs_ipg) / INOPB(fs)))))) -#define ino_to_fsbo(fs, x) ((x) % INOPB(fs)) +#define ino_to_cg(fs, x) ((x) / (fs)->fs_ipg) +#define ino_to_fsba(fs, x) ((ufs2_daddr_t)(cgimin(fs, ino_to_cg(fs, x)) + (blkstofrags((fs), (((x) % (fs)->fs_ipg) / INOPB(fs)))))) +#define ino_to_fsbo(fs, x) ((x) % INOPB(fs)) +#define blkoff(fs, loc) ((loc) & (fs)->fs_qbmask) // calculates (loc % fs->fs_bsize) +#define lblkno(fs, loc) ((loc) >> (fs)->fs_bshift) // calculates (loc / fs->fs_bsize) +#define fragroundup(fs, size) (((size) + (fs)->fs_qfmask) & (fs)->fs_fmask) // calculates roundup(size, fs->fs_fsize) -#define blkoff(fs, loc) /* calculates (loc % fs->fs_bsize) */ \ - ((loc) & (fs)->fs_qbmask) -#define lblkno(fs, loc) /* calculates (loc / fs->fs_bsize) */ \ - ((loc) >> (fs)->fs_bshift) -#define fragroundup(fs, size) /* calculates roundup(size, fs->fs_fsize) */ \ - (((size) + (fs)->fs_qfmask) & (fs)->fs_fmask) - - -#define sblksize(fs, size, lbn) \ - (((lbn) >= NDADDR || (size) >= ((lbn) + 1) << (fs)->fs_bshift) \ - ? (fs)->fs_bsize \ - : (fragroundup(fs, blkoff(fs, (size))))) - - - +#define sblksize(fs, size, lbn) (((lbn) >= NDADDR || (size) >= ((lbn) + 1) << (fs)->fs_bshift) ? (fs)->fs_bsize : (fragroundup(fs, blkoff(fs, (size))))) typedef int32_t ufs1_daddr_t; typedef int64_t ufs2_daddr_t; @@ -110,186 +92,184 @@ // MrOlsen (2016-01-16) NOTE: typedef __int64_t daddr_t; struct dirent { - __uint32_t d_fileno; /* file number of entry */ - __uint16_t d_reclen; /* length of this record */ - __uint8_t d_type; /* file type, see below */ - __uint8_t d_namlen; /* length of string in d_name */ - char d_name[MAXNAMLEN + 1]; /* name must be no longer than this */ - }; + __uint32_t d_fileno; /* file number of entry */ + __uint16_t d_reclen; /* length of this record */ + __uint8_t d_type; /* file type, see below */ + __uint8_t d_namlen; /* length of string in d_name */ + char d_name[MAXNAMLEN + 1]; /* name must be no longer than this */ +}; #define NXADDR 2 /* External addresses in inode. */ #define NDADDR 12 /* Direct addresses in inode. */ #define NIADDR 3 /* Indirect addresses in inode. */ struct ufs2_dinode { - u_int16_t di_mode; /* 0: IFMT, permissions; see below. */ - int16_t di_nlink; /* 2: File link count. */ - u_int32_t di_uid; /* 4: File owner. */ - u_int32_t di_gid; /* 8: File group. */ - u_int32_t di_blksize; /* 12: Inode blocksize. */ - u_int64_t di_size; /* 16: File byte count. */ - u_int64_t di_blocks; /* 24: Bytes actually held. */ - ufs_time_t di_atime; /* 32: Last access time. */ - ufs_time_t di_mtime; /* 40: Last modified time. */ - ufs_time_t di_ctime; /* 48: Last inode change time. */ - ufs_time_t di_birthtime; /* 56: Inode creation time. */ - int32_t di_mtimensec; /* 64: Last modified time. */ - int32_t di_atimensec; /* 68: Last access time. */ - int32_t di_ctimensec; /* 72: Last inode change time. */ - int32_t di_birthnsec; /* 76: Inode creation time. */ - int32_t di_gen; /* 80: Generation number. */ - u_int32_t di_kernflags; /* 84: Kernel flags. */ - u_int32_t di_flags; /* 88: Status flags (chflags). */ - int32_t di_extsize; /* 92: External attributes block. */ - ufs2_daddr_t di_extb[NXADDR];/* 96: External attributes block. */ - ufs2_daddr_t di_db[NDADDR]; /* 112: Direct disk blocks. */ - ufs2_daddr_t di_ib[NIADDR]; /* 208: Indirect disk blocks. */ - int64_t di_spare[3]; /* 232: Reserved; currently unused */ - }; + u_int16_t di_mode; /* 0: IFMT, permissions; see below. */ + int16_t di_nlink; /* 2: File link count. */ + u_int32_t di_uid; /* 4: File owner. */ + u_int32_t di_gid; /* 8: File group. */ + u_int32_t di_blksize; /* 12: Inode blocksize. */ + u_int64_t di_size; /* 16: File byte count. */ + u_int64_t di_blocks; /* 24: Bytes actually held. */ + ufs_time_t di_atime; /* 32: Last access time. */ + ufs_time_t di_mtime; /* 40: Last modified time. */ + ufs_time_t di_ctime; /* 48: Last inode change time. */ + ufs_time_t di_birthtime; /* 56: Inode creation time. */ + int32_t di_mtimensec; /* 64: Last modified time. */ + int32_t di_atimensec; /* 68: Last access time. */ + int32_t di_ctimensec; /* 72: Last inode change time. */ + int32_t di_birthnsec; /* 76: Inode creation time. */ + int32_t di_gen; /* 80: Generation number. */ + u_int32_t di_kernflags; /* 84: Kernel flags. */ + u_int32_t di_flags; /* 88: Status flags (chflags). */ + int32_t di_extsize; /* 92: External attributes block. */ + ufs2_daddr_t di_extb[NXADDR];/* 96: External attributes block. */ + ufs2_daddr_t di_db[NDADDR]; /* 112: Direct disk blocks. */ + ufs2_daddr_t di_ib[NIADDR]; /* 208: Indirect disk blocks. */ + int64_t di_spare[3]; /* 232: Reserved; currently unused */ +}; struct ufs1_dinode { - u_int16_t di_mode; /* 0: IFMT, permissions; see below. */ - int16_t di_nlink; /* 2: File link count. */ - union { - u_int16_t oldids[2]; /* 4: Ffs: old user and group ids. */ + u_int16_t di_mode; /* 0: IFMT, permissions; see below. */ + int16_t di_nlink; /* 2: File link count. */ + union { + u_int16_t oldids[2]; /* 4: Ffs: old user and group ids. */ } di_u; - u_int64_t di_size; /* 8: File byte count. */ - int32_t di_atime; /* 16: Last access time. */ - int32_t di_atimensec; /* 20: Last access time. */ - int32_t di_mtime; /* 24: Last modified time. */ - int32_t di_mtimensec; /* 28: Last modified time. */ - int32_t di_ctime; /* 32: Last inode change time. */ - int32_t di_ctimensec; /* 36: Last inode change time. */ - ufs1_daddr_t di_db[NDADDR]; /* 40: Direct disk blocks. */ - ufs1_daddr_t di_ib[NIADDR]; /* 88: Indirect disk blocks. */ - u_int32_t di_flags; /* 100: Status flags (chflags). */ - int32_t di_blocks; /* 104: Blocks actually held. */ - int32_t di_gen; /* 108: Generation number. */ - u_int32_t di_uid; /* 112: File owner. */ - u_int32_t di_gid; /* 116: File group. */ - int32_t di_spare[2]; /* 120: Reserved; currently unused */ - }; + u_int64_t di_size; /* 8: File byte count. */ + int32_t di_atime; /* 16: Last access time. */ + int32_t di_atimensec; /* 20: Last access time. */ + int32_t di_mtime; /* 24: Last modified time. */ + int32_t di_mtimensec; /* 28: Last modified time. */ + int32_t di_ctime; /* 32: Last inode change time. */ + int32_t di_ctimensec; /* 36: Last inode change time. */ + ufs1_daddr_t di_db[NDADDR]; /* 40: Direct disk blocks. */ + ufs1_daddr_t di_ib[NIADDR]; /* 88: Indirect disk blocks. */ + u_int32_t di_flags; /* 100: Status flags (chflags). */ + int32_t di_blocks; /* 104: Blocks actually held. */ + int32_t di_gen; /* 108: Generation number. */ + u_int32_t di_uid; /* 112: File owner. */ + u_int32_t di_gid; /* 116: File group. */ + int32_t di_spare[2]; /* 120: Reserved; currently unused */ +}; struct csum { - int32_t cs_ndir; /* number of directories */ - int32_t cs_nbfree; /* number of free blocks */ - int32_t cs_nifree; /* number of free inodes */ - int32_t cs_nffree; /* number of free frags */ + int32_t cs_ndir; /* number of directories */ + int32_t cs_nbfree; /* number of free blocks */ + int32_t cs_nifree; /* number of free inodes */ + int32_t cs_nffree; /* number of free frags */ }; struct csum_total { - int64_t cs_ndir; /* number of directories */ - int64_t cs_nbfree; /* number of free blocks */ - int64_t cs_nifree; /* number of free inodes */ - int64_t cs_nffree; /* number of free frags */ - int64_t cs_numclusters; /* number of free clusters */ - int64_t cs_spare[3]; /* future expansion */ + int64_t cs_ndir; /* number of directories */ + int64_t cs_nbfree; /* number of free blocks */ + int64_t cs_nifree; /* number of free inodes */ + int64_t cs_nffree; /* number of free frags */ + int64_t cs_numclusters; /* number of free clusters */ + int64_t cs_spare[3]; /* future expansion */ }; - struct fs { - int32_t fs_firstfield; /* historic filesystem linked list, */ - int32_t fs_unused_1; /* used for incore super blocks */ - int32_t fs_sblkno; /* offset of super-block in filesys */ - int32_t fs_cblkno; /* offset of cyl-block in filesys */ - int32_t fs_iblkno; /* offset of inode-blocks in filesys */ - int32_t fs_dblkno; /* offset of first data after cg */ - int32_t fs_old_cgoffset; /* cylinder group offset in cylinder */ - int32_t fs_old_cgmask; /* used to calc mod fs_ntrak */ - int32_t fs_old_time; /* last time written */ - int32_t fs_old_size; /* number of blocks in fs */ - int32_t fs_old_dsize; /* number of data blocks in fs */ - int32_t fs_ncg; /* number of cylinder groups */ - int32_t fs_bsize; /* size of basic blocks in fs */ - int32_t fs_fsize; /* size of frag blocks in fs */ - int32_t fs_frag; /* number of frags in a block in fs */ -/* these are configuration parameters */ - int32_t fs_minfree; /* minimum percentage of free blocks */ - int32_t fs_old_rotdelay; /* num of ms for optimal next block */ - int32_t fs_old_rps; /* disk revolutions per second */ -/* these fields can be computed from the others */ - int32_t fs_bmask; /* ``blkoff'' calc of blk offsets */ - int32_t fs_fmask; /* ``fragoff'' calc of frag offsets */ - int32_t fs_bshift; /* ``lblkno'' calc of logical blkno */ - int32_t fs_fshift; /* ``numfrags'' calc number of frags */ -/* these are configuration parameters */ - int32_t fs_maxcontig; /* max number of contiguous blks */ - int32_t fs_maxbpg; /* max number of blks per cyl group */ -/* these fields can be computed from the others */ - int32_t fs_fragshift; /* block to frag shift */ - int32_t fs_fsbtodb; /* fsbtodb and dbtofsb shift constant */ - int32_t fs_sbsize; /* actual size of super block */ - int32_t fs_spare1[2]; /* old fs_csmask */ - /* old fs_csshift */ - int32_t fs_nindir; /* value of NINDIR */ - int32_t fs_inopb; /* value of INOPB */ - int32_t fs_old_nspf; /* value of NSPF */ -/* yet another configuration parameter */ - int32_t fs_optim; /* optimization preference, see below */ - int32_t fs_old_npsect; /* # sectors/track including spares */ - int32_t fs_old_interleave; /* hardware sector interleave */ - int32_t fs_old_trackskew; /* sector 0 skew, per track */ - int32_t fs_id[2]; /* unique filesystem id */ -/* sizes determined by number of cylinder groups and their sizes */ - int32_t fs_old_csaddr; /* blk addr of cyl grp summary area */ - int32_t fs_cssize; /* size of cyl grp summary area */ - int32_t fs_cgsize; /* cylinder group size */ - int32_t fs_spare2; /* old fs_ntrak */ - int32_t fs_old_nsect; /* sectors per track */ - int32_t fs_old_spc; /* sectors per cylinder */ - int32_t fs_old_ncyl; /* cylinders in filesystem */ - int32_t fs_old_cpg; /* cylinders per group */ - int32_t fs_ipg; /* inodes per group */ - int32_t fs_fpg; /* blocks per group * fs_frag */ -/* this data must be re-computed after crashes */ - struct csum fs_old_cstotal; /* cylinder summary information */ -/* these fields are cleared at mount time */ - int8_t fs_fmod; /* super block modified flag */ - int8_t fs_clean; /* filesystem is clean flag */ - int8_t fs_ronly; /* mounted read-only flag */ - int8_t fs_old_flags; /* old FS_ flags */ - u_char fs_fsmnt[MAXMNTLEN]; /* name mounted on */ - u_char fs_volname[MAXVOLLEN]; /* volume name */ - u_int64_t fs_swuid; /* system-wide uid */ - int32_t fs_pad; /* due to alignment of fs_swuid */ -/* these fields retain the current block allocation info */ - int32_t fs_cgrotor; /* last cg searched */ - void *fs_ocsp[NOCSPTRS]; /* padding; was list of fs_cs buffers */ - u_int8_t *fs_contigdirs; /* (u) # of contig. allocated dirs */ - struct csum *fs_csp; /* (u) cg summary info buffer */ - int32_t *fs_maxcluster; /* (u) max cluster in each cyl group */ - u_int *fs_active; /* (u) used by snapshots to track fs */ - int32_t fs_old_cpc; /* cyl per cycle in postbl */ - int32_t fs_maxbsize; /* maximum blocking factor permitted */ - int64_t fs_sparecon64[17]; /* old rotation block list head */ - int64_t fs_sblockloc; /* byte offset of standard superblock */ - struct csum_total fs_cstotal; /* (u) cylinder summary information */ - ufs_time_t fs_time; /* last time written */ - int64_t fs_size; /* number of blocks in fs */ - int64_t fs_dsize; /* number of data blocks in fs */ - ufs2_daddr_t fs_csaddr; /* blk addr of cyl grp summary area */ - int64_t fs_pendingblocks; /* (u) blocks being freed */ - int32_t fs_pendinginodes; /* (u) inodes being freed */ - int32_t fs_snapinum[FSMAXSNAP];/* list of snapshot inode numbers */ - int32_t fs_avgfilesize; /* expected average file size */ - int32_t fs_avgfpdir; /* expected # of files per directory */ - int32_t fs_save_cgsize; /* save real cg size to use fs_bsize */ - int32_t fs_sparecon32[26]; /* reserved for future constants */ - int32_t fs_flags; /* see FS_ flags below */ - int32_t fs_contigsumsize; /* size of cluster summary array */ - int32_t fs_maxsymlinklen; /* max length of an internal symlink */ - int32_t fs_old_inodefmt; /* format of on-disk inodes */ - u_int64_t fs_maxfilesize; /* maximum representable file size */ - int64_t fs_qbmask; /* ~fs_bmask for use with 64-bit size */ - int64_t fs_qfmask; /* ~fs_fmask for use with 64-bit size */ - int32_t fs_state; /* validate fs_clean field */ - int32_t fs_old_postblformat; /* format of positional layout tables */ - int32_t fs_old_nrpos; /* number of rotational positions */ - int32_t fs_spare5[2]; /* old fs_postbloff */ - /* old fs_rotbloff */ - int32_t fs_magic; /* magic number */ + int32_t fs_firstfield; /* historic filesystem linked list, */ + int32_t fs_unused_1; /* used for incore super blocks */ + int32_t fs_sblkno; /* offset of super-block in filesys */ + int32_t fs_cblkno; /* offset of cyl-block in filesys */ + int32_t fs_iblkno; /* offset of inode-blocks in filesys */ + int32_t fs_dblkno; /* offset of first data after cg */ + int32_t fs_old_cgoffset; /* cylinder group offset in cylinder */ + int32_t fs_old_cgmask; /* used to calc mod fs_ntrak */ + int32_t fs_old_time; /* last time written */ + int32_t fs_old_size; /* number of blocks in fs */ + int32_t fs_old_dsize; /* number of data blocks in fs */ + int32_t fs_ncg; /* number of cylinder groups */ + int32_t fs_bsize; /* size of basic blocks in fs */ + int32_t fs_fsize; /* size of frag blocks in fs */ + int32_t fs_frag; /* number of frags in a block in fs */ + /* these are configuration parameters */ + int32_t fs_minfree; /* minimum percentage of free blocks */ + int32_t fs_old_rotdelay; /* num of ms for optimal next block */ + int32_t fs_old_rps; /* disk revolutions per second */ + /* these fields can be computed from the others */ + int32_t fs_bmask; /* ``blkoff'' calc of blk offsets */ + int32_t fs_fmask; /* ``fragoff'' calc of frag offsets */ + int32_t fs_bshift; /* ``lblkno'' calc of logical blkno */ + int32_t fs_fshift; /* ``numfrags'' calc number of frags */ + /* these are configuration parameters */ + int32_t fs_maxcontig; /* max number of contiguous blks */ + int32_t fs_maxbpg; /* max number of blks per cyl group */ + /* these fields can be computed from the others */ + int32_t fs_fragshift; /* block to frag shift */ + int32_t fs_fsbtodb; /* fsbtodb and dbtofsb shift constant */ + int32_t fs_sbsize; /* actual size of super block */ + int32_t fs_spare1[2]; /* old fs_csmask */ + /* old fs_csshift */ + int32_t fs_nindir; /* value of NINDIR */ + int32_t fs_inopb; /* value of INOPB */ + int32_t fs_old_nspf; /* value of NSPF */ + /* yet another configuration parameter */ + int32_t fs_optim; /* optimization preference, see below */ + int32_t fs_old_npsect; /* # sectors/track including spares */ + int32_t fs_old_interleave; /* hardware sector interleave */ + int32_t fs_old_trackskew; /* sector 0 skew, per track */ + int32_t fs_id[2]; /* unique filesystem id */ + /* sizes determined by number of cylinder groups and their sizes */ + int32_t fs_old_csaddr; /* blk addr of cyl grp summary area */ + int32_t fs_cssize; /* size of cyl grp summary area */ + int32_t fs_cgsize; /* cylinder group size */ + int32_t fs_spare2; /* old fs_ntrak */ + int32_t fs_old_nsect; /* sectors per track */ + int32_t fs_old_spc; /* sectors per cylinder */ + int32_t fs_old_ncyl; /* cylinders in filesystem */ + int32_t fs_old_cpg; /* cylinders per group */ + int32_t fs_ipg; /* inodes per group */ + int32_t fs_fpg; /* blocks per group * fs_frag */ + /* this data must be re-computed after crashes */ + struct csum fs_old_cstotal; /* cylinder summary information */ + /* these fields are cleared at mount time */ + int8_t fs_fmod; /* super block modified flag */ + int8_t fs_clean; /* filesystem is clean flag */ + int8_t fs_ronly; /* mounted read-only flag */ + int8_t fs_old_flags; /* old FS_ flags */ + u_char fs_fsmnt[MAXMNTLEN]; /* name mounted on */ + u_char fs_volname[MAXVOLLEN]; /* volume name */ + u_int64_t fs_swuid; /* system-wide uid */ + int32_t fs_pad; /* due to alignment of fs_swuid */ + /* these fields retain the current block allocation info */ + int32_t fs_cgrotor; /* last cg searched */ + void *fs_ocsp[NOCSPTRS]; /* padding; was list of fs_cs buffers */ + u_int8_t *fs_contigdirs; /* (u) # of contig. allocated dirs */ + struct csum *fs_csp; /* (u) cg summary info buffer */ + int32_t *fs_maxcluster; /* (u) max cluster in each cyl group */ + u_int *fs_active; /* (u) used by snapshots to track fs */ + int32_t fs_old_cpc; /* cyl per cycle in postbl */ + int32_t fs_maxbsize; /* maximum blocking factor permitted */ + int64_t fs_sparecon64[17]; /* old rotation block list head */ + int64_t fs_sblockloc; /* byte offset of standard superblock */ + struct csum_total fs_cstotal; /* (u) cylinder summary information */ + ufs_time_t fs_time; /* last time written */ + int64_t fs_size; /* number of blocks in fs */ + int64_t fs_dsize; /* number of data blocks in fs */ + ufs2_daddr_t fs_csaddr; /* blk addr of cyl grp summary area */ + int64_t fs_pendingblocks; /* (u) blocks being freed */ + int32_t fs_pendinginodes; /* (u) inodes being freed */ + int32_t fs_snapinum[FSMAXSNAP];/* list of snapshot inode numbers */ + int32_t fs_avgfilesize; /* expected average file size */ + int32_t fs_avgfpdir; /* expected # of files per directory */ + int32_t fs_save_cgsize; /* save real cg size to use fs_bsize */ + int32_t fs_sparecon32[26]; /* reserved for future constants */ + int32_t fs_flags; /* see FS_ flags below */ + int32_t fs_contigsumsize; /* size of cluster summary array */ + int32_t fs_maxsymlinklen; /* max length of an internal symlink */ + int32_t fs_old_inodefmt; /* format of on-disk inodes */ + u_int64_t fs_maxfilesize; /* maximum representable file size */ + int64_t fs_qbmask; /* ~fs_bmask for use with 64-bit size */ + int64_t fs_qfmask; /* ~fs_fmask for use with 64-bit size */ + int32_t fs_state; /* validate fs_clean field */ + int32_t fs_old_postblformat; /* format of positional layout tables */ + int32_t fs_old_nrpos; /* number of rotational positions */ + int32_t fs_spare5[2]; /* old fs_postbloff */ + /* old fs_rotbloff */ + int32_t fs_magic; /* magic number */ }; - int ufs_init(); int ufs_initialize(); @@ -298,4 +278,3 @@ /*** END ***/ - diff --git a/src/sys/init/Makefile b/src/sys/init/Makefile index 5861f78..91a2c4a 100644 --- a/src/sys/init/Makefile +++ b/src/sys/init/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl # Objects OBJS = start.o main.o static.o diff --git a/src/sys/init/main.c b/src/sys/init/main.c index c5e2d5b..b53e799 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -75,22 +75,22 @@ *****************************************************************************************/ ubixDescriptorTable(ubixGDT, 11) { - { .dummy = 0}, - ubixStandardDescriptor(0x0000, 0xFFFFF, (dCode + dRead + dBig + dBiglim)), - ubixStandardDescriptor(0x0000, 0xFFFFF, (dData + dWrite + dBig + dBiglim)), - ubixStandardDescriptor(0x0000, 0xFFFFF, (dLdt)), - ubixStandardDescriptor(0x4200, (sizeof(struct tssStruct)), (dTss + dDpl3)), - ubixStandardDescriptor(0x0000, 0xFFFFF, (dCode + dRead + dBig + dBiglim + dDpl3)), - ubixStandardDescriptor(0x0000, 0xFFFFF, (dData + dWrite + dBig + dBiglim + dDpl3)), - ubixStandardDescriptor(0x4200, (sizeof(struct tssStruct)), (dTss)), - ubixStandardDescriptor(0x6200, (sizeof(struct tssStruct)), (dTss)), - ubixStandardDescriptor(0x0000, 0xFFFFF, (dData + dWrite + dBig + dBiglim + dDpl0)), - ubixStandardDescriptor(0x0000, 0xFFFFF, (dData + dWrite + dBig + dBiglim + dDpl3)), +{ .dummy = 0}, +ubixStandardDescriptor(0x0000, 0xFFFFF, (dCode + dRead + dBig + dBiglim)), +ubixStandardDescriptor(0x0000, 0xFFFFF, (dData + dWrite + dBig + dBiglim)), +ubixStandardDescriptor(0x0000, 0xFFFFF, (dLdt)), +ubixStandardDescriptor(0x4200, (sizeof(struct tssStruct)), (dTss + dDpl3)), +ubixStandardDescriptor(0x0000, 0xFFFFF, (dCode + dRead + dBig + dBiglim + dDpl3)), +ubixStandardDescriptor(0x0000, 0xFFFFF, (dData + dWrite + dBig + dBiglim + dDpl3)), +ubixStandardDescriptor(0x4200, (sizeof(struct tssStruct)), (dTss)), +ubixStandardDescriptor(0x6200, (sizeof(struct tssStruct)), (dTss)), +ubixStandardDescriptor(0x0000, 0xFFFFF, (dData + dWrite + dBig + dBiglim + dDpl0)), +ubixStandardDescriptor(0x0000, 0xFFFFF, (dData + dWrite + dBig + dBiglim + dDpl3)), }; struct { - unsigned short limit __attribute__ ((packed)); - union descriptorTableUnion *gdt __attribute__ ((packed)); + unsigned short limit __attribute__ ((packed)); + union descriptorTableUnion *gdt __attribute__ ((packed)); } loadGDT = { (11 * sizeof(union descriptorTableUnion) - 1), ubixGDT }; /** @@ -98,7 +98,7 @@ * * \param rootdev address of root device structure */ -int kmain( uInt32 rootdev ) { +int kmain(uInt32 rootdev) { /* Set up counter for startup routine */ int i = 0x0; uInt32 *sysTask = 0x0; @@ -107,20 +107,19 @@ clearScreen(); /* Modify src/sys/include/ubixos/init.h to add a startup routine */ - for ( i = 0x0; i < init_tasksTotal; i++ ) { - if ( init_tasks[i]() != 0x0 ) - kpanic( "Error: Initializing System.\n" ); + for (i = 0x0; i < init_tasksTotal; i++) { + if (init_tasks[i]() != 0x0) + kpanic("Error: Initializing System.\n"); } /* New Root Mount Point */ //Old 2 new 10 - kprintf( "[0x%X][0x%X:0x%X:0x%X:0x%X:0x%X:0x%X]\n", B_ADAPTOR( rootdev ), B_CONTROLLER( rootdev ), B_SLICE( rootdev ), B_UNIT( rootdev ), B_PARTITION( rootdev ), B_TYPE( rootdev ) ); + kprintf("[0x%X][0x%X:0x%X:0x%X:0x%X:0x%X:0x%X]\n", B_ADAPTOR(rootdev), B_CONTROLLER(rootdev), B_SLICE(rootdev), B_UNIT(rootdev), B_PARTITION(rootdev), B_TYPE(rootdev)); //if ( vfs_mount( 0x1, B_PARTITION(rootdev) + 2, 0x0, 0xAA, "sys", "rw" ) != 0x0 ) { - if ( vfs_mount( 0x1, 0x2, 0x0, 0xAA, "sys", "rw" ) != 0x0 ) { - kprintf( "Problem Mounting sys Mount Point\n" ); - } - else - kprintf( "Mounted sys\n" ); + if (vfs_mount(0x1, 0x2, 0x0, 0xAA, "sys", "rw") != 0x0) { + kprintf("Problem Mounting sys Mount Point\n"); + } else + kprintf("Mounted sys\n"); /* Do our mounting */ /* @@ -133,26 +132,26 @@ */ /* Initialize the system */ - kprintf( "Free Pages: [%i]\n", systemVitals->freePages ); - kprintf( "MemoryMap: [0x%X]\n", vmmMemoryMap ); - kprintf( "Starting OS\n" ); + kprintf("Free Pages: [%i]\n", systemVitals->freePages); + kprintf("MemoryMap: [0x%X]\n", vmmMemoryMap); + kprintf("Starting OS\n"); - sysTask = kmalloc( 0x2000 ); + sysTask = kmalloc(0x2000); asm("nop"); - if ( sysTask == NULL ) - kprintf( "OS: Unable to allocate memory\n" ); + if (sysTask == NULL) + kprintf("OS: Unable to allocate memory\n"); - execThread( systemTask, (uInt32) sysTask + 0x2000, 0x0 ); - kprintf( "Thread Start!\n" ); + execThread(systemTask, (uInt32) sysTask + 0x2000, 0x0); + kprintf("Thread Start!\n"); - //execFile( "sys:/bin/init", 0x0, 0x0, 0x0 ); /* OS Initializer */ - execFile( "sys:/bin/login", 0x0, 0x0, 0x0 ); /* OS Initializer */ + execFile("sys:/bin/init", 0x0, 0x0, 0x0); /* OS Initializer */ + //execFile( "sys:/bin/login", 0x0, 0x0, 0x0 ); /* OS Initializer */ - irqEnable( 0x0 ); + irqEnable(0x0); - while ( 0x1 ) + while (0x1) asm("hlt"); /* Keep haulting until the scheduler reacts */ diff --git a/src/sys/isa/Makefile b/src/sys/isa/Makefile index 61620b5..75940e5 100644 --- a/src/sys/isa/Makefile +++ b/src/sys/isa/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl # Objects OBJS = mouse.o atkbd.o fdc.o 8259.o pit.o diff --git a/src/sys/kernel/Makefile b/src/sys/kernel/Makefile index bb8fed4..9fff977 100644 --- a/src/sys/kernel/Makefile +++ b/src/sys/kernel/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 150 2016-01-18 19:59:43Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl # Objects OBJS = tty.o kern_sig.o pipe.o kern_descrip.o kern_sysctl.o gen_calls.o endtask.o ld.o time.o syscall_new.o elf.o ubthread.o vitals.o access.o syscalls.o diff --git a/src/sys/kmods/Makefile b/src/sys/kmods/Makefile index 4116eaa..c92973b 100644 --- a/src/sys/kmods/Makefile +++ b/src/sys/kmods/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +Makefile.incl +include ../Makefile.incl # Objects OBJS = kmod.o diff --git a/src/sys/lib/Makefile b/src/sys/lib/Makefile index c4066fe..3c103e1 100644 --- a/src/sys/lib/Makefile +++ b/src/sys/lib/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl INCLUDES += -I../../lib/objgfx40/ diff --git a/src/sys/mpi/Makefile b/src/sys/mpi/Makefile index fdb55d2..23e7f72 100644 --- a/src/sys/mpi/Makefile +++ b/src/sys/mpi/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl # Objects OBJS = system.o message.o diff --git a/src/sys/net/api/Makefile b/src/sys/net/api/Makefile index 4c5cd61..e128f03 100644 --- a/src/sys/net/api/Makefile +++ b/src/sys/net/api/Makefile @@ -3,8 +3,8 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +Makefile.incl +include ../../Makefile.incl # Objects OBJS = api_lib.o api_msg.o err.o sockets.o tcpip.o diff --git a/src/sys/net/net/Makefile b/src/sys/net/net/Makefile index 3df3581..58a9974 100644 --- a/src/sys/net/net/Makefile +++ b/src/sys/net/net/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +Makefile.incl +include ../../Makefile.incl # Objects OBJS = udpecho.o init.o sys_arch.o shell.o bot.o diff --git a/src/sys/net/netif/Makefile b/src/sys/net/netif/Makefile index dabb536..694f69f 100755 --- a/src/sys/net/netif/Makefile +++ b/src/sys/net/netif/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../../Makefile.inc -include ../../Makefile.inc +Makefile.incl +include ../../Makefile.incl # Objects OBJS = ethernetif.o loopif.o tcpdump.o arp.o diff --git a/src/sys/pci/Makefile b/src/sys/pci/Makefile index ccefaae..ce76ae6 100644 --- a/src/sys/pci/Makefile +++ b/src/sys/pci/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl # Objects OBJS = hd.o pci.o diff --git a/src/sys/sde/Makefile b/src/sys/sde/Makefile index 7eaaa3a..399904a 100644 --- a/src/sys/sde/Makefile +++ b/src/sys/sde/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +Makefile.incl +include ../Makefile.incl # Linker LINKER = ld diff --git a/src/sys/sys/Makefile b/src/sys/sys/Makefile index f0b5dd7..4581027 100644 --- a/src/sys/sys/Makefile +++ b/src/sys/sys/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 140 2016-01-17 01:36:09Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl # Objects OBJS = dma.o idt.o io.o video.o device.o elf.o diff --git a/src/sys/vmm/Makefile b/src/sys/vmm/Makefile index c506005..9b4b704 100644 --- a/src/sys/vmm/Makefile +++ b/src/sys/vmm/Makefile @@ -2,8 +2,8 @@ # $Id: Makefile 132 2016-01-15 14:30:19Z reddawg $ # Include Global 'Source' Options -include ../../Makefile.inc -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl # Objects OBJS = page_fault.o pagefault.o getfreevirtualpage.o copyvirtualspace.o setpageattributes.o unmappage.o getphysicaladdr.o getfreepage.o createvirtualspace.o vmm_memory.o paging.o vmm_init.o vmm_mmap.o diff --git a/src/sys/vmm/pagefault.c b/src/sys/vmm/pagefault.c index 720cabd..2124907 100644 --- a/src/sys/vmm/pagefault.c +++ b/src/sys/vmm/pagefault.c @@ -52,7 +52,7 @@ *****************************************************************************************/ /* void vmm_pageFault(uInt32 memAddr,uInt32 eip,uInt32 esp) { */ -void vmm_pageFault( struct trapframe *frame, u_int32_t cr2 ) { +void vmm_pageFault(struct trapframe *frame, u_int32_t cr2) { uInt32 i = 0x0, pageTableIndex = 0x0, pageDirectoryIndex = 0x0; uInt32 *pageDir = 0x0, *pageTable = 0x0; uInt32 *src = 0x0, *dst = 0x0; @@ -61,18 +61,18 @@ u_int32_t eip = frame->tf_eip; u_int32_t memAddr = cr2; -kprintf("CR2: [0x%X], EIP: 0x%X, ERR: 0x%X\n", cr2, frame->tf_eip, frame->tf_err); +//MrOlsen 2017-12-15 - kprintf("CR2: [0x%X], EIP: 0x%X, ERR: 0x%X\n", cr2, frame->tf_eip, frame->tf_err); /* Try to aquire lock otherwise spin till we do */ - spinLock( &pageFaultSpinLock ); + spinLock(&pageFaultSpinLock); /* Set page dir pointer to the address of the visable page directory */ pageDir = (uInt32 *) PD_BASE_ADDR; /* UBU - This is a temp panic for 0x0 read write later on I will handle this differently */ - if ( memAddr == 0x0 ) { - kprintf( "Segfault At Address: [0x%X][0x%X][%i][0x%X]\n", memAddr, esp, _current->id, eip ); - kpanic( "Error We Wrote To 0x0\n" ); + if (memAddr == 0x0) { + kprintf("Segfault At Address: [0x%X][0x%X][%i][0x%X]\n", memAddr, esp, _current->id, eip); + kpanic("Error We Wrote To 0x0\n"); } /* Calculate The Page Directory Index */ @@ -82,53 +82,49 @@ pageTableIndex = ((memAddr >> 12) & 0x3FF); /* UBU - This is a temporary routine for handling access to a page of a non existant page table */ - if ( pageDir[pageDirectoryIndex] == 0x0 ) { - kprintf( "Segfault At Address: [0x%X][0x%X][%i][0x%X], Not A Valid Page Table\n", memAddr, esp, _current->id, eip ); - spinUnlock( &pageFaultSpinLock ); - endTask( _current->id ); - } - else { + if (pageDir[pageDirectoryIndex] == 0x0) { + kprintf("Segfault At Address: [0x%X][0x%X][%i][0x%X], Not A Valid Page Table\n", memAddr, esp, _current->id, eip); + spinUnlock(&pageFaultSpinLock); + endTask(_current->id); + } else { /* Set pageTable To Point To Virtual Address Of Page Table */ pageTable = (uInt32 *) (PT_BASE_ADDR + (0x1000 * pageDirectoryIndex)); /* Test if this is a COW on page */ - if ( ((uInt32) pageTable[pageTableIndex] & PAGE_COW) == PAGE_COW ) { + if (((uInt32) pageTable[pageTableIndex] & PAGE_COW) == PAGE_COW) { /* Set Src To Base Address Of Page To Copy */ src = (uInt32 *) (memAddr & 0xFFFFF000); /* Allocate A Free Page For Destination */ /* USE vmInfo */ - dst = (uInt32 *) vmmGetFreeVirtualPage( _current->id, 1, 0x1 ); + dst = (uInt32 *) vmmGetFreeVirtualPage(_current->id, 1, 0x1); /* Copy Memory */ - for ( i = 0; i < PD_ENTRIES; i++ ) { + for (i = 0; i < PD_ENTRIES; i++) { dst[i] = src[i]; } /* Adjust The COW Counter For Physical Page */ - adjustCowCounter( ((uInt32) pageTable[pageTableIndex] & 0xFFFFF000), -1 ); + adjustCowCounter(((uInt32) pageTable[pageTableIndex] & 0xFFFFF000), -1); /* Remap In New Page */ - pageTable[pageTableIndex] = (uInt32)( vmm_getPhysicalAddr( (uInt32) dst ) | (memAddr & 0xFFF) ); + pageTable[pageTableIndex] = (uInt32) (vmm_getPhysicalAddr((uInt32) dst) | (memAddr & 0xFFF)); /* Unlink From Memory Map Allocated Page */ - vmmUnmapPage( (uInt32) dst, 1 ); - } - else if ( pageTable[pageTableIndex] != 0x0 ) { - kprintf( "Security failed pagetable not user permission\n" ); - kprintf( "pageDir: [0x%X]\n", pageDir[pageDirectoryIndex]); - kprintf( "pageTable: [0x%X:0x%X:0x%X:0x%X]\n", pageTable[pageTableIndex], pageTableIndex, pageDirectoryIndex, eip ); - kprintf( "Segfault At Address: [0x%X][0x%X][%i][0x%X] Non Mapped\n", memAddr, esp, _current->id, eip ); - spinUnlock( &pageFaultSpinLock ); - endTask( _current->id ); - } - else if ( memAddr < (_current->td.vm_dsize + _current->td.vm_daddr) ) { - pageTable[pageTableIndex] = (uInt32) vmmFindFreePage( _current->id ) | PAGE_DEFAULT; - } - else { - spinUnlock( &pageFaultSpinLock ); + vmmUnmapPage((uInt32) dst, 1); + } else if (pageTable[pageTableIndex] != 0x0) { + kprintf("Security failed pagetable not user permission\n"); + kprintf("pageDir: [0x%X]\n", pageDir[pageDirectoryIndex]); + kprintf("pageTable: [0x%X:0x%X:0x%X:0x%X]\n", pageTable[pageTableIndex], pageTableIndex, pageDirectoryIndex, eip); + kprintf("Segfault At Address: [0x%X][0x%X][%i][0x%X] Non Mapped\n", memAddr, esp, _current->id, eip); + spinUnlock(&pageFaultSpinLock); + endTask(_current->id); + } else if (memAddr < (_current->td.vm_dsize + _current->td.vm_daddr)) { + pageTable[pageTableIndex] = (uInt32) vmmFindFreePage(_current->id) | PAGE_DEFAULT; + } else { + spinUnlock(&pageFaultSpinLock); /* Need To Create A Routine For Attempting To Access Non Mapped Memory */ - kprintf( "pageDir: [0x%X]\n", pageDir[pageDirectoryIndex]); - kprintf( "pageTable: [0x%X:0x%X:0x%X:0x%X]\n", pageTable[pageTableIndex], pageTableIndex, pageDirectoryIndex, eip ); - kprintf( "Segfault At Address: [0x%X][0x%X][%i][0x%X] Non Mapped\n", memAddr, esp, _current->id, eip ); - kprintf( "Out Of Stack Space: [0x%X]\n", memAddr & 0xFF0000 ); - spinUnlock( &pageFaultSpinLock ); - endTask( _current->id ); + kprintf("pageDir: [0x%X]\n", pageDir[pageDirectoryIndex]); + kprintf("pageTable: [0x%X:0x%X:0x%X:0x%X]\n", pageTable[pageTableIndex], pageTableIndex, pageDirectoryIndex, eip); + kprintf("Segfault At Address: [0x%X][0x%X][%i][0x%X] Non Mapped\n", memAddr, esp, _current->id, eip); + kprintf("Out Of Stack Space: [0x%X]\n", memAddr & 0xFF0000); + spinUnlock(&pageFaultSpinLock); + endTask(_current->id); } } asm volatile( @@ -137,7 +133,7 @@ ); /* Release the spin lock */ - spinUnlock( &pageFaultSpinLock ); + spinUnlock(&pageFaultSpinLock); return; } diff --git a/src/sys/vmm/vmm_init.c b/src/sys/vmm/vmm_init.c index 0fca568..03b21f6 100644 --- a/src/sys/vmm/vmm_init.c +++ b/src/sys/vmm/vmm_init.c @@ -39,13 +39,13 @@ */ int vmm_init() { - if ( vmmMemMapInit() != 0x0 ) - K_PANIC( "Couldn't Initialize vmmMemMap" ); + if (vmmMemMapInit() != 0x0) + K_PANIC("Couldn't Initialize vmmMemMap"); - if ( vmm_pagingInit() != 0x0 ) - K_PANIC( "Couldn't Initialize paging system" ); + if (vmm_pagingInit() != 0x0) + K_PANIC("Couldn't Initialize paging system"); - return ( 0x0 ); + return (0x0); } /*** diff --git a/src/tools/Makefile b/src/tools/Makefile index f55f5c7..7f94f5d 100644 --- a/src/tools/Makefile +++ b/src/tools/Makefile @@ -2,9 +2,10 @@ # Kernel Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../Makefile.inc +include ../../Makefile.incl +include ../Makefile.incl -CC=gcc +#CC=gcc #Kernel File Name #BINARY = format diff --git a/src/tools/Makefile.old b/src/tools/Makefile.old index e5d4292..885cccb 100644 --- a/src/tools/Makefile.old +++ b/src/tools/Makefile.old @@ -2,7 +2,7 @@ # Kernel Makefile (C) 2002 The UbixOS Project # Include Global 'Source' Options -include ../Makefile.inc +Makefile.incl CC=gcc