Merge branch 'cross_prelink_staging' into master_staging

Signed-off-by: Mark Hatle <[email protected]>

.gitignore

@@ -16,14 +16,18 @@ install-sh
 libtool
 ltmain.sh
 m4
+!m4/Makefile.am
+!m4/libelf.m4
 missing
 *.o
 stamp-h1
 test-driver
 .deps
 .libs
+.dirstamp
 *.lo
 *.la
 execstack
 prelink
 prelink-rtld
+*~

ChangeLog

@@ -1,3 +1,19 @@
+2016-22-28   Mark Hatle <[email protected]>
+	* Merge with cross_prelink
+
+2016-03-18   Donn Seeley <[email protected]>
+	* testsuite/order: Add test to verify prelink/prelink-rtld resolution
+		order
+
+2016-03-18  Mark Hatle <[email protected]>
+	* src/dso.c: Fix compilation warning
+
+2016-03-10  Mark Hatle <[email protected]>
+	* configure.ac, m4/libelf.m4, doc/Makefile.am, gelf/Makefile.am,
+	  gelfx/Makefile.am, gelfx32/Makefile.am, patches/Makefile.am,
+	  src/Makefile.am, testsuite/Makefile.am:
+		Update to avoid autoconf/automake warnings
+
 2015-10-29  Mark Hatle <[email protected]>
 	    Kyle McMartin  <[email protected]>
 	    Jakub Jelinek  <[email protected]>

Makefile.am

@@ -1,6 +1,5 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
 MAINT_CHARSET = latin1
 
 ACLOCAL_AMFLAGS = -I m4

configure.ac

@@ -1,11 +1,12 @@
 dnl Process this file with autoconf to produce a configure script. -*-m4-*-
-AC_INIT(src/prelink.c)
+AC_INIT([prelink], [1.0])
 AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.50)			dnl Minimum Autoconf version required.
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 
-AM_INIT_AUTOMAKE([prelink], [0.0])
+AM_INIT_AUTOMAKE([subdir-objects gnu 1.4])
 
 ALL_LINGUAS=
 

doc/Makefile.am

@@ -1,7 +1,5 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 man_MANS = prelink.8 execstack.8
 EXTRA_DIST = prelink.8 execstack.8 prelink.conf
 PDFLATEXINPUTS = TEXINPUTS_pdflatex=.:$(srcdir):`kpsewhich --progname=pdflatex --show-path=cnf.pdflatex`

gelf/Makefile.am

@@ -1,10 +1,8 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -Wall
 AM_CFLAGS = -Wall
-INCLUDES = @GELFINCLUDE@
+AM_CPPFLAGS = @GELFINCLUDE@
 
 noinst_LTLIBRARIES = libgelf.la
 

gelfx/Makefile.am

@@ -1,5 +1,3 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 noinst_HEADERS = gelfx.h

gelfx32/Makefile.am

@@ -1,5 +1,3 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 noinst_HEADERS = gelfx.h

m4/libelf.m4

@@ -5,7 +5,7 @@ dnl Detect it.
 
 dnl Written by Jakub Jelinek <[email protected]>.
 
-AC_DEFUN(AC_LIBELF_SXWORD,
+AC_DEFUN([AC_LIBELF_SXWORD],
   [AC_TRY_RUN([
 #include <errno.h>
 #include <fcntl.h>

patches/Makefile.am

@@ -1,5 +1,3 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 EXTRA_DIST = libelf-0.7.0.patch libelf-0.7.0-hash.patch linux-2.4.10.patch

src/Makefile.am

@@ -1,7 +1,5 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 PKGVERSION = "\"@PKGVERSION@\""
 REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\""
 
@@ -13,7 +11,7 @@ AM_CPPFLAGS = -DSBINDIR='"@sbindir@"' -DBINDIR='"@bindir@"' \
 	    -DEXEEXT='"$(EXEEXT)"' \
 	    -DPKGVERSION=$(PKGVERSION) \
 	    -DREPORT_BUGS_TO=$(REPORT_BUGS_TO)
-INCLUDES = @GELFINCLUDE@
+AM_CPPFLAGS += @GELFINCLUDE@
 
 sbin_PROGRAMS = prelink
 bin_PROGRAMS = execstack

src/dso.c

@@ -285,7 +285,7 @@ fdopen_dso (int fd, const char *name)
   Elf *elf = NULL;
   GElf_Ehdr ehdr;
   GElf_Addr last_off;
-  int i, j, k, last, *sections, *invsections;
+  int i, j, k, *sections, *invsections;
   DSO *dso = NULL;
   struct PLArch *plarch;
   extern struct PLArch __start_pl_arch[], __stop_pl_arch[];
@@ -390,11 +390,10 @@ fdopen_dso (int fd, const char *name)
 
   sections = (int *) alloca (dso->ehdr.e_shnum * sizeof (int) * 2);
   sections[0] = 0;
-  for (i = 1, j = 1, k = dso->ehdr.e_shnum, last = -1;
+  for (i = 1, j = 1, k = dso->ehdr.e_shnum;
        i < dso->ehdr.e_shnum; ++i)
     if (RELOCATE_SCN (dso->shdr[i].sh_flags))
       {
-	last = i;
 	sections[j++] = i;
       }
     else

testsuite/.gitignore

@@ -27,6 +27,8 @@ reloc2
 reloc3
 reloc6
 reloc7
+reloc8
+reloc9
 shuffle1
 shuffle2
 shuffle3
@@ -45,4 +47,5 @@ tls6
 tls7
 tlstest
 undo1
+order
 

testsuite/Makefile.am

@@ -1,7 +1,5 @@
 ## Process this file with automake to create Makefile.in
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -Wall
 AM_CFLAGS = -Wall
 
@@ -16,7 +14,7 @@ TESTS = movelibs.sh \
 	cycle1.sh cycle2.sh \
 	deps1.sh deps2.sh \
 	ifunc1.sh ifunc2.sh ifunc3.sh \
-	undosyslibs.sh preload1.sh
+	undosyslibs.sh preload1.sh order.sh
 TESTS_ENVIRONMENT = \
 	PRELINK="../src/prelink -c ./prelink.conf -C ./prelink.cache --ld-library-path=. --dynamic-linker=`echo ./ld*.so.*[0-9]`" \
 	CC="$(CC) $(LINKOPTS)" CCLINK="$(CC) -Wl,--dynamic-linker=`echo ./ld*.so.*[0-9]`" \

testsuite/order.c

@@ -0,0 +1,15 @@
+#include <stdio.h>
+#include "orderlib1.h"
+#include "orderlib.h"
+
+int
+main()
+{
+  int rc = 0;
+  rc += orderlib1(); /* 10 */
+  rc += value();
+
+  printf("rc = %d (expect 6010)\n", rc);
+
+  return (rc != 6010);
+}

testsuite/order.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+. `dirname $0`/functions.sh
+rm -f order orderlib*.so order.log
+rm -f prelink.cache
+
+# Need a sysroot for this...
+$CC -shared -O2 -fpic -o orderlib3.so $srcdir/orderlib3.c
+$CC -shared -O2 -fpic -o orderlib2.so $srcdir/orderlib2.c
+$CC -shared -O2 -fpic -o orderlib1.so $srcdir/orderlib1.c orderlib3.so
+$CC -shared -O2 -fpic -o orderlib.so $srcdir/orderlib.c orderlib1.so orderlib2.so orderlib3.so
+BINS="order"
+LIBS="orderlib.so orderlib1.so orderlib2.so orderlib3.so"
+$CCLINK -o order $srcdir/order.c -Wl,-rpath-link,. orderlib.so orderlib3.so
+
+: > order.log
+LD_LIBRARY_PATH=. ./order >> order.log || exit 1
+#exit 1
+#savelibs
+echo $PRELINK ${PRELINK_OPTS--vm} ./order >> order.log
+$PRELINK ${PRELINK_OPTS--vm} ./order >> order.log 2>&1 || exit 2
+grep -q ^`echo $PRELINK | sed 's/ .*$/: /'` order.log && exit 3
+LD_LIBRARY_PATH=. ./order >> order.log || exit 4
+# So that it is not prelinked again
+chmod -x ./order

testsuite/orderlib.c

@@ -0,0 +1,10 @@
+#include "orderlib.h"
+#include "orderlib1.h"
+
+int orderlib1(void)
+{
+   int rc = 0;
+   rc += value();
+   rc += value1();
+   return rc;
+}

testsuite/orderlib.h

@@ -0,0 +1,2 @@
+int value(void);
+int value1(void);

testsuite/orderlib1.c

@@ -0,0 +1,6 @@
+#include "orderlib.h"
+
+int value1(void)
+{
+   return 10;
+}

testsuite/orderlib1.h

@@ -0,0 +1 @@
+int orderlib1(void);

testsuite/orderlib2.c

@@ -0,0 +1,6 @@
+#include "orderlib.h"
+
+int value(void)
+{
+   return 200;
+}

testsuite/orderlib3.c

@@ -0,0 +1,6 @@
+#include "orderlib.h"
+
+int value(void)
+{
+   return 3000;
+}