Changeset 440 for trunk/Makefile

Timestamp:

May 3, 2018, 5:51:22 PM (7 years ago)

Author:

alain

Message:

1/ Fix a bug in the Multithreaded "sort" applicationr:
The pthread_create() arguments must be declared as global variables.
2/ The exit syscall can be called by any thread of a process..

File:

• trunk/Makefile (modified) (9 diffs)

trunk/Makefile

@@ -11 +11 @@
 
 # Default values for hardware parameters.
-# These parameters should be defined in the 'params.mk' file.
+# These parameters should be defined in the 'params-hard.mk' file.
 ARCH            ?= /users/alain/soc/tsar-trunk-svn-2013/platforms/tsar_generic_iob
 X_SIZE          ?= 2
@@ -19 +19 @@
 FBF_WIDTH       ?= 256
 IOC_TYPE        ?= IOC_BDV
+
 # Checking hardware platform definition.
 ifeq ($(wildcard $(ARCH)),)
@@ -26 +27 @@
 # Rules that don't build target files
 # always out-of-date, need to be regenerated everytime they are called
-.PHONY: compile                         \
-        hard_config.h           \
-                dirs                                \
-                list                                \
-                extract                             \
-                fsck                                \
-                clean                               \
-                build_libs  \
-                build-disk                          \
-                $(BOOTLOADER_PATH)/build/boot.elf           \
-                kernel/build/kernel.elf \
-                user/init/build/init.elf \
-                user/ksh/build/ksh.elf \
-                user/pgcd/build/pgcd.elf \
-                user/sort/build/sort.elf \
+.PHONY: compile                                \
+        hard_config.h                      \
+                dirs                                           \
+                list                                           \
+                extract                                        \
+                fsck                                           \
+                clean                                          \
+                build_libs                         \
+                build-disk                                     \
+                $(BOOTLOADER_PATH)/build/boot.elf  \
+                kernel/build/kernel.elf            \
+                user/init/build/init.elf           \
+                user/ksh/build/ksh.elf             \
+                user/pgdc/build/pgcd.elf           \
+                user/hello/build/hello.elf         \
+                user/sort/build/sort.elf 
 
 # Virtual disk path
@@ -47 +49 @@
 # The Mtools used to build the FAT32 disk image perfom a few sanity checks, to
 # make sure that the disk is indeed an MS-DOS disk. However, the size of the
-# disk image used by ALMOS-VM is not MS-DOS compliant.
+# disk image used by ALMOS-MKH is not MS-DOS compliant.
 # Setting this variable prevents these checks.
 MTOOLS_SKIP_CHECK := 1
 
-# Rule to generate boot.elf, kernel.elf, ksh.elf, sort.elf and update virtual disk.
-compile: dirs                     \
-         build_disk               \
-         hard_config.h            \
-         build_libs               \
+# Rule to generate boot.elf, kernel.elf, all user.elf files, and update virtual disk.
+compile: dirs                              \
+         build_disk                        \
+         hard_config.h                     \
+         build_libs                        \
          $(BOOTLOADER_PATH)/build/boot.elf \
-         kernel/build/kernel.elf  \
-         user/init/build/init.elf \
-         user/ksh/build/ksh.elf   \
-         user/sort/build/sort.elf \
-         user/pgcd/build/pgcd.elf \
+         kernel/build/kernel.elf           \
+         user/init/build/init.elf          \
+         user/ksh/build/ksh.elf            \
+         user/pgcd/build/pgcd.elf          \
+         user/hello/build/hello.elf        \
+         user/sort/build/sort.elf          \
          list
 
-# Rule to create the build directories.
+# Rule to create the hdd directory
 dirs:
         @mkdir -p hdd
@@ -91 +94 @@
         $(MAKE) -C user/sort clean
         $(MAKE) -C user/pgcd clean
+        $(MAKE) -C user/hello clean
         $(MAKE) -C $(HAL_ARCH) clean
 
@@ -126 +130 @@
         mdir             -/ -b -i $(DISK_IMAGE) ::/
 
+############################################
+# Rules to generate the user level libraries
 build_libs: build_hal
         $(MAKE) -C $(LIBC_PATH)
@@ -136 +142 @@
         dd if=$@ of=$(DISK_IMAGE) seek=2 conv=notrunc
 
+#####################################################################
+# Rule to generate boot.elf and place it in sector #2 of virtual disk
 build_hal:
         $(MAKE) -C $(HAL_ARCH)
@@ -145 +153 @@
         mcopy -o -i $(DISK_IMAGE) $@ ::/bin/kernel
 
-###############################################################
-# Rules to generate various user .elf and copy on virtual disk
+#####################################################
+# Rules to generate user.elf and copy on virtual disk
 user/init/build/init.elf: build_libs
         $(MAKE) -C user/init
@@ -153 +161 @@
         $(MAKE) -C user/ksh
         mcopy -o -i $(DISK_IMAGE) $@ ::/bin/user
-user/pdcg/build/pdcg.elf: build_libs
-        $(MAKE) -C user/pdcg
+user/pgcd/build/pgcd.elf: build_libs
+        $(MAKE) -C user/pgcd
+        mcopy -o -i $(DISK_IMAGE) $@ ::/bin/user
+user/hello/build/hello.elf: build_libs
+        $(MAKE) -C user/hello
         mcopy -o -i $(DISK_IMAGE) $@ ::/bin/user
 user/sort/build/sort.elf: build_libs