7527 elfdump: sparc build failed after secflags integration

Review Request #319 — Created Jan. 6, 2017 and submitted — Latest diff uploaded

olafbohlen
illumos-gate
7527
general

7527 elfdump: sparc build failed after secflags integration

this is a very simple fix which just removes some whitespaces and newlines to satisfy a diff called in the Makefile of elfdump

before patch:

/src/oi-userland/components/openindiana/illumos-gate/illumos-gate/usr/src/tools/
proto/root_sparc-nd/opt/onbld/bin/sparc/ctfconvert -i -L VERSION gen_layout_obj.
o
sed -e '/^#include <struct_layout.h>/q' \
../common/struct_layout_sparc.c | sed -e '$d' \

struct_layout_sparc.tmp
./gen_struct_layout gen_layout_obj.o sparc \

struct_layout_sparc.tmp
--- struct_layout_sparc.tmp ::
+++ ../common/struct_layout_sparc.c ::
@@ -377,12 +377,12 @@

static const sl_prsecflags_layout_t prsecflags_layout = {
- { 0, 40, 0, 0 }, / sizeof (prsecflags_t) /
- { 0, 4, 0, 0 }, / pr_version /
- { 8, 8, 0, 0 }, / pr_effective /
- { 16, 8, 0, 0 }, / pr_inherit /
- { 24, 8, 0, 0 }, / pr_lower /
- { 32, 8, 0, 0 }, / pr_upper /
+ { 0, 40, 0, 0 }, / sizeof (prsecflags_t) /
+ { 0, 4, 0, 0 }, / pr_version /
+ { 8, 8, 0, 0 }, / pr_effective /
+ { 16, 8, 0, 0 }, / pr_inherit /
+ { 24, 8, 0, 0 }, / pr_lower /
+ { 32, 8, 0, 0 }, / pr_upper /
};

Error: struct_layout_sparc.c needs update!
Error code 1
The following command caused the error:
diff -u struct_layout_sparc.tmp \
../common/struct_layout_sparc.c ||\
{ echo "Error: struct_layout_sparc.c needs update!" ; exit 1; }
dmake: Warning: Target install' not remade because of errors Current working directory /src/oi-userland/components/openindiana/illumos-gate/illumos-gate/usr/src/cmd/sgs/elfdump/sparc *** Error code 1 The following command caused the error: cd sparc; pwd; dmake install dmake: Warning: Targetinstall' not remade because of errors
Current working directory /src/oi-userland/components/openindiana/illumos-gate/illumos-gate/usr/src/cmd/sgs/elfdump
Error code 1
dmake: Warning: Command failed for target `elfdump'
Current working directory /src/oi-userland/components/openindiana/illumos-gate/illumos-gate/usr/src/cmd/sgs

and:

/src/oi-userland/components/openindiana/illumos-gate/illumos-gate/usr/src/tools/
proto/root_sparc-nd/opt/onbld/bin/sparc/ctfconvert -i -L VERSION gen_layout_obj.
o
sed -e '/^#include <struct_layout.h>/q' \
../common/struct_layout_sparcv9.c | sed -e '$d' \

struct_layout_sparcv9.tmp
./gen_struct_layout gen_layout_obj.o sparcv9 \

struct_layout_sparcv9.tmp
--- struct_layout_sparcv9.tmp ::
+++ ../common/struct_layout_sparcv9.c ::
@@ -414,6 +414,8 @@
};

+
+
const sl_arch_layout_t *
struct_layout_sparcv9(void)
{
Error: struct_layout_sparcv9.c needs update!
Error code 1
The following command caused the error:
diff -u struct_layout_sparcv9.tmp \
../common/struct_layout_sparcv9.c ||\
{ echo "Error: struct_layout_sparcv9.c needs update!" ; exit 1; }
dmake: Warning: Target install' not remade because of errors Current working directory /src/oi-userland/components/openindiana/illumos-gate/illumos-gate/usr/src/cmd/sgs/elfdump/sparcv9 *** Error code 1 The following command caused the error: if [ -f sparcv9/Makefile ]; then \ cd sparcv9; pwd; dmake install; \ else /bin/true; fi dmake: Warning: Targetinstall' not remade because of errors
Current working directory /src/oi-userland/components/openindiana/illumos-gate/illumos-gate/usr/src/cmd/sgs/elfdump
Error code 1
dmake: Warning: Command failed for target `elfdump'

after patch:

/src/oi-userland/components/openindiana/illumos-gate/illumos-gate/usr/src/tools/
proto/root_sparc-nd/opt/onbld/bin/sparc/ctfconvert -i -L VERSION gen_layout_obj.
o
sed -e '/^#include <struct_layout.h>/q' \
../common/struct_layout_sparc.c | sed -e '$d' \

struct_layout_sparc.tmp
./gen_struct_layout gen_layout_obj.o sparc \

struct_layout_sparc.tmp
No differences encountered
touch check_struct_layout

[...]

/src/oi-userland/components/openindiana/illumos-gate/illumos-gate/usr/src/tools/
proto/root_sparc-nd/opt/onbld/bin/sparc/ctfconvert -i -L VERSION gen_layout_obj.
o
sed -e '/^#include <struct_layout.h>/q' \
../common/struct_layout_sparcv9.c | sed -e '$d' \

struct_layout_sparcv9.tmp
./gen_struct_layout gen_layout_obj.o sparcv9 \

struct_layout_sparcv9.tmp
No differences encountered
touch check_struct_layout

Loading...