Changeset 970c4d8 in mainline

Timestamp:

2013-08-15T09:41:43Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

820104d

Parents:

7fbe5ec

Message:

libposix: use objcopy more effectively

This removes the helper libposix tools that were used to redefine
conflicting symbols in libc.

objcopy can work on whole libraries thus there is no need to
unpack and repack them again.
Also, it accepts file with list of redefinitions, thus we do not
need to use xargs at all.

This solution is much simpler and also it speeds-up the compilation
a bit.

Location:

uspace/lib/posix

Files:

• Makefile (modified) (2 diffs)
• tools/create-redefines.sh (deleted)
• tools/get-collision-list.sh (deleted)
• tools/transform-symbols.sh (deleted)

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
 
@@ -85 +85 @@
 
 $(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 >$@