[PATCH v3] elf: Canonicalize $ORIGIN in an explicit ld.so invocation [BZ 25263]

[Florian Weimer]

* Adhemerval Zanella Netto:

> The only requirement is to avoid a the liborigin.so without a full path,
> which is the default for --enable-hardcoded-path-in-tests. I also tried
> to mimic the original provided testcase and avoid the extra RPATH entries,
> it is not really required.
>
> I only tested on system with recent glibc, so I think that's why I have
> not see the this build issue. Does the following fix the build issue?
>
> diff --git a/elf/Makefile b/elf/Makefile
> index 5a50c7d50c..3d60000ec9 100644
> --- a/elf/Makefile
> +++ b/elf/Makefile
> @@ -456,6 +456,7 @@ tests += \
>    tst-noload \
>    tst-non-directory-path \
>    tst-null-argv \
> +  tst-origin \
>    tst-p_align1 \
>    tst-p_align2 \
>    tst-p_align3 \
> @@ -1195,7 +1196,6 @@ extra-test-objs += $(addsuffix .os,$(strip $(modules-names)))
>  # filtmod1.so, tst-big-note-lib.so, tst-ro-dynamic-mod.so have special
>  # rules.
>  modules-names-nobuild += \
> -  liborigin-mod \
>    filtmod1 \
>    tst-audit24bmod1 \
>    tst-audit24bmod2 \
> @@ -3451,15 +3451,8 @@ $(objpfx)tst-dlopen-constructor-null-mod2.so: \
>
>  CFLAGS-tst-origin.c += $(no-stack-protector)
>  CFLAGS-liborigin-mod.c += $(no-stack-protector)
> -$(objpfx)tst-origin: $(objpfx)tst-origin.o $(objpfx)liborigin-mod.so
> -       $(LINK.o) -o $@ -B$(csu-objpfx) $(LDFLAGS.so) $< \
> -               -Wl,-rpath,\$$ORIGIN \
> -               -L$(subst :, -L,$(rpath-link)) -Wl,--no-as-needed -lorigin-mod
> -$(objpfx)liborigin-mod.so: $(objpfx)liborigin-mod.os
> -       $(LINK.o) -shared -o $@ -B$(csu-objpfx) $(LDFLAGS.so) \
> -               $(LDFLAGS-soname-fname) \
> -               $<
> -$(objpfx)tst-origin.out: tst-origin.sh $(objpfx)tst-origin
> +LDFLAGS-tst-origin += -Wl,-rpath,\$$ORIGIN -L$(subst :, -L,$(rpath-link)) -lorigin-mod
> +$(objpfx)tst-origin.out: tst-origin.sh $(objpfx)liborigin-mod.so $(objpfx)tst-origin
>         $(SHELL) \
>                 $< \
>                 '$(common-objpfx)' \

The patch did not apply to me.  This is how I fixed it up:

diff --git a/elf/Makefile b/elf/Makefile
index 5a50c7d50c..3d60000ec9 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -456,6 +456,7 @@ tests += \
   tst-noload \
   tst-non-directory-path \
   tst-null-argv \
+  tst-origin \
   tst-p_align1 \
   tst-p_align2 \
   tst-p_align3 \
@@ -1195,7 +1196,6 @@ extra-test-objs += $(addsuffix .os,$(strip $(modules-names)))
 # filtmod1.so, tst-big-note-lib.so, tst-ro-dynamic-mod.so have special
 # rules.
 modules-names-nobuild += \
-  liborigin-mod \
   filtmod1 \
   tst-audit24bmod1 \
   tst-audit24bmod2 \
@@ -3451,15 +3451,8 @@ $(objpfx)tst-dlopen-constructor-null-mod2.so: \
 
 CFLAGS-tst-origin.c += $(no-stack-protector)
 CFLAGS-liborigin-mod.c += $(no-stack-protector)
-$(objpfx)tst-origin: $(objpfx)tst-origin.o $(objpfx)liborigin-mod.so
-	$(LINK.o) -o $@ -B$(csu-objpfx) $(LDFLAGS.so) $< \
-		-Wl,-rpath,\$$ORIGIN \
-		-L$(subst :, -L,$(rpath-link)) -Wl,--no-as-needed -lorigin-mod
-$(objpfx)liborigin-mod.so: $(objpfx)liborigin-mod.os
-	$(LINK.o) -shared -o $@ -B$(csu-objpfx) $(LDFLAGS.so) \
-		$(LDFLAGS-soname-fname) \
-		$<
-$(objpfx)tst-origin.out: tst-origin.sh $(objpfx)tst-origin
+LDFLAGS-tst-origin += -Wl,-rpath,\$$ORIGIN -L$(subst :, -L,$(rpath-link)) -lorigin-mod
+$(objpfx)tst-origin.out: tst-origin.sh $(objpfx)liborigin-mod.so $(objpfx)tst-origin
 	$(SHELL) \
 		$< \
 		'$(common-objpfx)' \

This variant worked for me.

Thanks,
Florian