Handle '-r' option properly

[yunlian]

Summary

This fixs the bug
https://llvm.org/bugs/show_bug.cgi?id=12587

[yunlian]

ping?

[rnk]

lgtm

[rnk]

This doesn't look like it got committed, did you want me to do that?

[yunlian]

I have done arc commit --revision D<Revision> in my local svn repository and it seems to be successful, did I miss some thing?
If it does not get committed, please commit it for me, thanks.

[rnk]

Hm, I tried to add a test for this while committing it, and it doesn't pass for me. I think this needs more work.

[yunlian]

It seems this have not been checked in, could you please double check that?

Thanks

[rnk]

In D10279#207240, @yunlian wrote:

It seems this have not been checked in, could you please double check that?

I tried to add a test for this while committing it, and it doesn't pass for me. I think this needs more work. Your 'NoArgumentUnused' flag suppresses the warning message without actually passing -r to the linker.

[yunlian]

What is your test case?
I followed the bug https://llvm.org/bugs/show_bug.cgi?id=12587

Before my change, the output of 'file all.o' is
all.o: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), statically linked, not stripped

After this change, the output is
all.o: ELF 64-bit LSB relocatable, x86-64, version 1 (SYSV), not stripped

So I think this patch is working.

[rnk]

I tried adding -r to clang/test/Driver/Xlinker-args.c, and it did not get passed through.

[yunlian]

Do you still have the test case?

[yunlian]

I uploaded a test case.
Without the patch, the test case fails, with the patch, the test case passes.

[yunlian]

ping?

[rnk]

I tried adding this test case, and it did not pass on Windows. I will apply it and run it again.

[rnk]

Finally got my client clean and did this. Looks like it works, so I'll land it.

include/clang/Driver/Options.td

   Alias<resource_dir>;
 def rpath : Separate<["-"], "rpath">, Flags<[LinkerInput]>;
 def rtlib_EQ : Joined<["-", "--"], "rtlib=">;
-def r : Flag<["-"], "r">;
+def r : Flag<["-"], "r">, Flags<[LinkerInput,NoArgumentUnused]>;
 def save_temps_EQ : Joined<["-", "--"], "save-temps=">, Flags<[DriverOption]>,
   HelpText<"Save intermediate compilation results.">;
 def save_temps : Flag<["-", "--"], "save-temps">, Flags<[DriverOption]>,

test/Driver/Xlinker-args.c

 
 // RUN: %clang -target i386-apple-darwin9 -### \
 // RUN:   -Xlinker one -Xlinker --no-demangle \
-// RUN:   -Wl,two,--no-demangle,three -Xlinker four -z five %s 2> %t
+// RUN:   -Wl,two,--no-demangle,three -Xlinker four -z five -r %s 2> %t
 // RUN: FileCheck -check-prefix=DARWIN < %t %s
 //
 // RUN: %clang -target x86_64-pc-linux-gnu -### \
 // RUN:   -Xlinker one -Xlinker --no-demangle \
-// RUN:   -Wl,two,--no-demangle,three -Xlinker four -z five %s 2> %t
+// RUN:   -Wl,two,--no-demangle,three -Xlinker four -z five -r %s 2> %t
 // RUN: FileCheck -check-prefix=LINUX < %t %s
 //
 // DARWIN-NOT: --no-demangle
-// DARWIN: "one" "two" "three" "four" "-z" "five"
-// LINUX: "--no-demangle" "one" "two" "three" "four" "-z" "five"
+// DARWIN: "one" "two" "three" "four" "-z" "five" "-r"
+// LINUX: "--no-demangle" "one" "two" "three" "four" "-z" "five" "-r"
 
 // Check that we forward '-Xlinker' and '-Wl,' on Windows.
 // RUN: %clang -target i686-pc-win32 -### \