make: Remove linker stuff from OS makefile, clarify difference between stripped and minimal

Author: fwsGonzo

src/Makefile

@@ -40,9 +40,6 @@ INC_NEWLIB=$(INSTALL)/newlib/include
 CC  = $(shell command -v clang-3.8 || command -v clang-3.6)
 CPP = $(shell command -v clang++-3.8 || command -v clang++-3.6 || command -v clang++)
 # Set defaults if not defined
-ifndef LD_INC
-	LD_INC = ld
-endif
 ifndef AR_INC
 	AR_INC = ar
 endif
@@ -59,7 +56,6 @@ CINCLUDES = -I../api/sys -I$(INC_NEWLIB) -Iinclude -I../api
 
 CCOPTS  += $(CAPABS) $(WARNS) -c -m32 -march=i686 $(CINCLUDES)
 CPPOPTS += $(CAPABS) $(WARNS) -c -m32 -std=c++14 $(INCLUDES) -D_LIBCPP_HAS_NO_THREADS=1 -DOS_VERSION="\"$(shell git describe --dirty)\""
-LDOPTS = -nostdlib -melf_i386 -N --eh-frame-hdr --script=linker.ld
 
 # Objects
 ###################################################
@@ -106,7 +102,7 @@ CRTN_OBJ = crt/crtn.o
 ###################################################
 OS_DEPS = $(OS_OBJECTS:.o=.d)
 
-.PHONY: memdisk all debug stripped minimal clean
+.PHONY: all stripped minimal debug silent clean
 
 # Complete OS build
 ###################################################
@@ -118,10 +114,12 @@ all: CAPABS += -O2
 all: includeos
 	@echo "\n>>> Built OS-library. Install to '"$(INSTALL)"' using 'make install'"
 
-stripped: CAPABS += -Os
-stripped: LDOPTS += -s
+stripped: CAPABS += -O2
 stripped: includeos
 
+minimal: CAPABS += -Os
+minimal: includeos
+
 # Build like "all" but with debugging output (i.e. the 'debug'-macro) enabled
 debug-info: CAPABS += -UNO_DEBUG
 debug-info: CAPABS += -DGSL_THROW_ON_CONTRACT_VIOLATION
@@ -144,31 +142,8 @@ debug-all: includeos test
 silent: CPPOPTS += -DNO_INFO=1
 silent: includeos
 
-minimal: CPPOPTS += -ffunction-sections -fdata-sections
-minimal: LDOPTS += --gc-sections
-minimal: stripped
-
 includeos: bootloader multiboot libc++abi.a os.a drivers platforms
 
-# Test service
-###################################################
-LIBS_OBJ = os.a $(LIBCXX) os.a $(LIBC_OBJ) $(LIBM_OBJ) $(LIBGCC)
-
-
-CRTBEGIN_OBJ = $(CRTI_OBJ) $(INSTALL)/crt/crtbegin.o
-CRTEND_OBJ   = $(INSTALL)/crt/crtend.o $(CRTN_OBJ)
-
-TEST_OBJ = debug/test_service.o util/service_name.o
-
-test_service: CPPOPTS += -DSERVICE_NAME="\"Test Service\""
-test_service: $(TEST_OBJ) $(CRTI_OBJ) $(CRTN_OBJ)
-	@echo "\n>> Linking test service"
-	@echo "\n>> LDOPTS = $(LDOPTS)"
-	touch smalldisk
-	$(LD_INC) -v $(LDOPTS) $(CRTBEGIN_OBJ) $(TEST_OBJ) $(LIBS_OBJ) $(CRTEND_OBJ) -o debug/$@
-
-test: test_service
-
 # OS libraries
 ###################################################
 # OS
@@ -252,10 +227,7 @@ etags:
 
 # Cleanup
 ###################################################
-clean_tests:
-	$(RM) debug/*.o debug/*.d debug/*.img debug/test_service debug/test_ipv6 debug/test_tcp
-
-clean: clean_tests
+clean:
 	$(RM) $(OS_OBJECTS) $(CXXABI_OBJ) $(OS_DEPS) $(DRIVERS) $(DRIVERS_DEPS) $(PLATFORMS) $(PLATFORMS_DEPS)
 	$(RM) os.a libc++abi.a
 	$(RM) bootloader apic_boot apic_boot.o boot/multiboot.o

src/seed/Makefile

@@ -22,7 +22,7 @@ INSTALL = $(INCLUDEOS_INSTALL)
 
 # Compiler and linker options
 ###################################################
-CAPABS_COMMON = -mstackrealign -msse3 -fstack-protector-strong
+CAPABS_COMMON = -mstackrealign -msse3 -fstack-protector-strong -DOS_TERMINATE_ON_CONTRACT_VIOLATION
 WARNS  = -Wall -Wextra #-pedantic
 DEBUG_OPTS = -ggdb3 -v
 
@@ -52,9 +52,10 @@ endif
 
 INCLUDES = -I$(INC_LIBCXX) -I$(INSTALL)/api/sys -I$(INC_NEWLIB) -I$(INSTALL)/api -I$(INSTALL)/mod/GSL $(LOCAL_INCLUDES)
 
-all:      CAPABS = $(CAPABS_COMMON) -O2 -DOS_TERMINATE_ON_CONTRACT_VIOLATION
+all:      CAPABS = $(CAPABS_COMMON) -O2
 debug:    CAPABS = $(CAPABS_COMMON) -O0
-stripped: CAPABS = $(CAPABS_COMMON) -Os
+stripped: CAPABS = $(CAPABS_COMMON) -O2
+
 # by default, don't use strip because it has caused us some problems
 STRIPPED=--strip-debug
 
@@ -110,7 +111,7 @@ debug-info: service
 debug: CCOPTS  += $(DEBUG_OPTS)
 debug: CPPOPTS += $(DEBUG_OPTS)
 debug: OBJ_LIST += $(LIBG_OBJ)
-debug: CAPABS += -O0
+debug: CPPOPTS += -O0
 debug: STRIPPED=
 debug: service
 
@@ -119,12 +120,11 @@ debug-all: CAPABS += -UNO_DEBUG
 debug-all: CCOPTS  += $(DEBUG_OPTS)
 debug-all: CPPOPTS += $(DEBUG_OPTS)
 debug-all: OBJ_LIST += $(LIBG_OBJ)
-debug-all: CAPABS += -O0
+debug-all: CPPOPTS += -O0
 debug-all: service
 
-minimal: CPPOPTS += -ffunction-sections -fdata-sections
-minimal: LDOPTS += --gc-sections
 minimal: stripped
+minimal: CPPOPTS += -Os
 
 # Service
 ###################################################