Changeset 0773396 in mainline for uspace/lib/posix/Makefile

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/lib/posix/Makefile (modified) (3 diffs)

uspace/lib/posix/Makefile

@@ -42 +42 @@
 FIXED_C_LIBRARY = libc4posix.a
 
-REDEFS_HIDE_LIBC = redefs-hide-libc.xargs
-REDEFS_SHOW_LIBPOSIX = redefs-show-posix.xargs
+REDEFS_HIDE_LIBC = redefs-hide-libc-symbols.list
+REDEFS_SHOW_LIBPOSIX = redefs-show-posix-symbols.list
 COLLISIONS_LIST = collisions.list
 
@@ -60 +60 @@
         source/getopt.c \
         source/locale.c \
-        source/math.c \
+        source/pthread/condvar.c \
+        source/pthread/keys.c \
+        source/pthread/mutex.c \
+        source/pthread/threads.c \
         source/pwd.c \
         source/signal.c \
@@ -81 +84 @@
 
 $(FIXED_C_LIBRARY): $(REDEFS_HIDE_LIBC) $(REDEFS_SHOW_LIBPOSIX)
-        ./tools/transform-symbols.sh \
-                $(OBJCOPY) $(AR) echo \
-                $(LIBC_FILE) $@ \
-                $(REDEFS_HIDE_LIBC) $(REDEFS_SHOW_LIBPOSIX)
+        $(OBJCOPY) --redefine-syms=$(REDEFS_HIDE_LIBC) $(LIBC_FILE) $@
+        $(OBJCOPY) --redefine-syms=$(REDEFS_SHOW_LIBPOSIX) $@ $@
 
 $(FIXED_POSIX_LIBRARY): $(LIBRARY).a $(REDEFS_HIDE_LIBC) $(REDEFS_SHOW_LIBPOSIX)
-        ./tools/transform-symbols.sh \
-                $(OBJCOPY) $(AR) echo \
-                $(LIBRARY).a $@ \
-                $(REDEFS_HIDE_LIBC) $(REDEFS_SHOW_LIBPOSIX)
+        $(OBJCOPY) --redefine-syms=$(REDEFS_HIDE_LIBC) $(LIBRARY).a $@
+        $(OBJCOPY) --redefine-syms=$(REDEFS_SHOW_LIBPOSIX) $@ $@
 
 $(REDEFS_HIDE_LIBC): $(COLLISIONS_LIST)
-        ./tools/create-redefines.sh "" "__helenos_libc_" <$(COLLISIONS_LIST) >$@
-        
+        sed 's/.*/& __helenos_libc_&/' <$(COLLISIONS_LIST) >$@
+
 $(REDEFS_SHOW_LIBPOSIX): $(COLLISIONS_LIST)
-        ./tools/create-redefines.sh "posix_" "" <$(COLLISIONS_LIST) >$@
+        sed 's/.*/posix_& &/' <$(COLLISIONS_LIST) >$@
 
 $(COLLISIONS_LIST):
-        ./tools/get-collision-list.sh ./include/posix >$@
+        find ./include/posix -name '*.h' -exec \
+                sed -n -e '/^#/d' -e 's/__POSIX_DEF__/\n&/gp' {} \; | \
+                sed -n -e 's/__POSIX_DEF__(\([^)]*\)).*/\1/p' | \
+                sort -u >$@