Changeset c8bb1633 in mainline for uspace/app

Timestamp:

2013-07-10T08:58:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3908355, 4c53333

Parents:

30c1b75 (diff), 98abd40 (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:

Extending POSIX library

Merge from lp:~vojtech-horky/helenos/gcc-port.

This is work-in-progress merge from branch aimed at bringing GCC to run
inside HelenOS.

The most notable change is dealing with the name clashes in libposix and
libc. For ported applications, the libposix headers looks as normal
POSIX headers and there is no need to do preprocessor-based renaming inside
the ported application. The renaming is done inside object files instead.
See revision 1745 in lp:~vojtech-horky/helenos/gcc-port [1] for more
detailed explanation.
The solution is definitely not perfect but shall deal with the naming
conflicts in much safer manner than using the redefines.

There were some other changes as well, mostly small ones.

• Add some functions, some as ToDo ones (i.e. empty implementation).
• Add more POSIX headers, split some existing.

[1] ​http://bazaar.launchpad.net/~vojtech-horky/helenos/gcc-port/revision/1745

Location:

uspace/app

Files:

• bdsh/cmds/builtins/batch/batch.c (modified) (6 diffs)
• binutils/intrusive.sh (modified) (2 diffs)
• pcc/config.h (modified) (1 diff)

uspace/app/bdsh/cmds/builtins/batch/batch.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
+#include <errno.h>
 #include "config.h"
 #include "util.h"
@@ -44 +46 @@
         if (level == HELP_SHORT) {
                 printf(
-                "\n  batch [filename]\n"
+                "\n  batch [filename] [-c]\n"
                 "  Issues commands stored in the file.\n"
                 "  Each command must correspond to the single line in the file.\n\n");
@@ -54 +56 @@
                 "  separate groups of commands. There is no support for comments,\n"
                 "  variables, recursion or other programming constructs - the `batch'\n"
-                "  command is indeed very trivial.\n\n");
+                "  command is indeed very trivial.\n"
+                "  If the filename is followed by -c, execution continues even if some\n"
+                "  of the commands failed.\n\n");
         }
 
@@ -65 +69 @@
 {
         unsigned int argc;
+        bool continue_despite_errors = false;
 
         /* Count the arguments */
@@ -72 +77 @@
                 printf("%s - no input file provided.\n", cmdname);
                 return CMD_FAILURE;
+        }
+
+        if (argc > 2) {
+                if (str_cmp(argv[2], "-c") == 0)
+                        continue_despite_errors = true;
         }
 
@@ -99 +109 @@
                                         rc = process_input(&fusr);
                                         /* fusr->line was freed by process_input() */
+                                        if ((rc != EOK) && continue_despite_errors) {
+                                                /* Mute the error. */
+                                                rc = EOK;
+                                        }
                                 }
                                 if (rc == 0 && c != EOF) {

uspace/app/binutils/intrusive.sh

@@ -96 +96 @@
 # libposix function name redefinitons in one of the arm-specific files.
 #
+# Patch 9
+# Libiberty does not trust our strncmp that is provided in libposix.
+# That is because when cross-compiling, it cannot check how it behaves
+# and assumes the worst. But then it clashes when linking (due to
+# multiple definitions of ...) and this patch prevents compilation of
+# liberty strncmp.
 
 case "$1" in
@@ -157 +163 @@
                 # Patch libiberty configure script.
                 cat "$2/libiberty/configure.backup" | \
-                # See Patch 1.
-                sed 's/^cross_compiling=no/cross_compiling=yes/g' \
+                # See Patch 1 and 9.
+                sed -e 's/^cross_compiling=no/cross_compiling=yes/g' \
+                        -e 's/ac_cv_func_strncmp_works=no/ac_cv_func_strncmp_works=yes/g' \
                 > "$2/libiberty/configure"
 

uspace/app/pcc/config.h

@@ -50 +50 @@
 
 /* Define to 1 if you have the `mkstemp' function. */
-//#define HAVE_MKSTEMP 1
+#define HAVE_MKSTEMP 1
 
 /* Define to 1 if you have the `snprintf' function. */