Skip to contentSkip to conversation

Partially revert "build: -no-pie is no functional linker flag"

PATCH Superseded Jessica Clarke 4 participants 7 messages Aug 5, 2021 – Oct 15, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Partially revert "build: -no-pie is no functional linker flag"

This partially reverts commit bbd2d5a8120771ec59b86a80a1f51884e0a26e53.

This commit was misguided and broke using --disable-pie on any distro that enables PIE by default in their compiler driver, including Debian and its derivatives. Whilst -no-pie is not a linker flag, it is a compiler driver flag that ensures -pie is not automatically passed by it to the linker. Without it, all compile_prog checks will fail as any code built with the explicit -fno-pie will fail to link with the implicit default -pie due to trying to use position-dependent relocations. The only bug that needed fixing was LDFLAGS_NOPIE being used as a flag for the linker itself in pc-bios/optionrom/Makefile.

Note this does not reinstate exporting LDFLAGS_NOPIE, as it is unused, since the only previous use was the one that should not have existed. I have also updated the comment for the -fno-pie and -no-pie checks to reflect what they're actually needed for.

Fixes bbd2d5a8120771ec59b86a80a1f51884e0a26e53
Cc Christian Ehrhardt <[email protected]>
Cc Paolo Bonzini <[email protected]>
---
 configure | 2 ++
 1 file changed, 2 insertions(+)
configure +2 -0
index 9a79a004d7..b8b29e1eee 100755
@@ -2249,6 +2249,7 @@ EOF
 # Check we support --no-pie first; we will need this for building ROMs.
 if compile_prog "-Werror -fno-pie" "-no-pie"; then
   CFLAGS_NOPIE="-fno-pie"
+  LDFLAGS_NOPIE="-no-pie"
 fi
 
 if test "$static" = "yes"; then
@@ -2264,6 +2265,7 @@ if test "$static" = "yes"; then
   fi
 elif test "$pie" = "no"; then
   CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS"
+  CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS"
 elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
   CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS"
   CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS"
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 Partially revert "build: -no-pie is no functional linker flag"

This partially reverts commit bbd2d5a8120771ec59b86a80a1f51884e0a26e53.

This commit was misguided and broke using --disable-pie on any distro that enables PIE by default in their compiler driver, including Debian and its derivatives. Whilst -no-pie is not a linker flag, it is a compiler driver flag that ensures -pie is not automatically passed by it to the linker. Without it, all compile_prog checks will fail as any code built with the explicit -fno-pie will fail to link with the implicit default -pie due to trying to use position-dependent relocations. The only bug that needed fixing was LDFLAGS_NOPIE being used as a flag for the linker itself in pc-bios/optionrom/Makefile.

Note this does not reinstate exporting LDFLAGS_NOPIE, as it is unused, since the only previous use was the one that should not have existed. I have also updated the comment for the -fno-pie and -no-pie checks to reflect what they're actually needed for.

Fixes bbd2d5a8120771ec59b86a80a1f51884e0a26e53
Cc Christian Ehrhardt <[email protected]>
Cc Paolo Bonzini <[email protected]>

---
Changes in v2:
* Actually include the comment change; didn't add the hunk when

    amending...
 configure | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
configure +4 -1
index 9a79a004d7..8aecd277ed 100755
@@ -2246,9 +2246,11 @@ static THREAD int tls_var;
 int main(void) { return tls_var; }
 EOF
 
-# Check we support --no-pie first; we will need this for building ROMs.
+# Check we support -fno-pie and -no-pie first; we will need the former for
+# building ROMs, and both for everything if --disable-pie is passed.
 if compile_prog "-Werror -fno-pie" "-no-pie"; then
   CFLAGS_NOPIE="-fno-pie"
+  LDFLAGS_NOPIE="-no-pie"
 fi
 
 if test "$static" = "yes"; then
@@ -2264,6 +2266,7 @@ if test "$static" = "yes"; then
   fi
 elif test "$pie" = "no"; then
   CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS"
+  CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS"
 elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
   CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS"
   CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS"
Signature · 1 line
2.17.1
#2 lore raw

Quoting Jessica Clarke (2021-08-05 14:25:45)

Quoted 17 lines

This partially reverts commit bbd2d5a8120771ec59b86a80a1f51884e0a26e53.

This commit was misguided and broke using --disable-pie on any distro that enables PIE by default in their compiler driver, including Debian and its derivatives. Whilst -no-pie is not a linker flag, it is a compiler driver flag that ensures -pie is not automatically passed by it to the linker. Without it, all compile_prog checks will fail as any code built with the explicit -fno-pie will fail to link with the implicit default -pie due to trying to use position-dependent relocations. The only bug that needed fixing was LDFLAGS_NOPIE being used as a flag for the linker itself in pc-bios/optionrom/Makefile.

Note this does not reinstate exporting LDFLAGS_NOPIE, as it is unused, since the only previous use was the one that should not have existed. I have also updated the comment for the -fno-pie and -no-pie checks to reflect what they're actually needed for.

Quoted 5 lines
Fixes bbd2d5a8120771ec59b86a80a1f51884e0a26e53
Cc Christian Ehrhardt <[email protected]>
Cc Paolo Bonzini <[email protected]>

Ping. --disable-pie builds are broken on Ubuntu 20.04 without this regression fix. Looking to include it for v6.0.1/v6.1.1.

Quoted 37 lines

---
Changes in v2:
* Actually include the comment change; didn't add the hunk when

    amending...
 configure | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
configure +4 -1
index 9a79a004d7..8aecd277ed 100755
@@ -2246,9 +2246,11 @@ static THREAD int tls_var;
 int main(void) { return tls_var; }
 EOF
 
-# Check we support --no-pie first; we will need this for building ROMs.
+# Check we support -fno-pie and -no-pie first; we will need the former for
+# building ROMs, and both for everything if --disable-pie is passed.
 if compile_prog "-Werror -fno-pie" "-no-pie"; then
   CFLAGS_NOPIE="-fno-pie"
+  LDFLAGS_NOPIE="-no-pie"
 fi
 
 if test "$static" = "yes"; then
@@ -2264,6 +2266,7 @@ if test "$static" = "yes"; then
   fi
 elif test "$pie" = "no"; then
   CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS"
+  CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS"
 elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
   CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS"
   CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS"
Signature · 1 line
2.17.1
#3 lore raw
Quoted 18 lines · Michael Roth

Quoting Jessica Clarke (2021-08-05 14:25:45)

Quoted 17 lines

This partially reverts commit bbd2d5a8120771ec59b86a80a1f51884e0a26e53.

This commit was misguided and broke using --disable-pie on any distro that enables PIE by default in their compiler driver, including Debian and its derivatives. Whilst -no-pie is not a linker flag, it is a compiler driver flag that ensures -pie is not automatically passed by it to the linker. Without it, all compile_prog checks will fail as any code built with the explicit -fno-pie will fail to link with the implicit default -pie due to trying to use position-dependent relocations. The only bug that needed fixing was LDFLAGS_NOPIE being used as a flag for the linker itself in pc-bios/optionrom/Makefile.

Note this does not reinstate exporting LDFLAGS_NOPIE, as it is unused, since the only previous use was the one that should not have existed. I have also updated the comment for the -fno-pie and -no-pie checks to reflect what they're actually needed for.

Quoted 8 lines
Quoted 5 lines
Fixes bbd2d5a8120771ec59b86a80a1f51884e0a26e53
Cc Christian Ehrhardt <[email protected]>
Cc Paolo Bonzini <[email protected]>

Ping. --disable-pie builds are broken on Ubuntu 20.04 without this regression fix. Looking to include it for v6.0.1/v6.1.1.

Sorry, missed this the first time around.

I think a better fix is to remove the direct invocation of ld in pc-bios/optionrom/Makefile, and instead rely on the compiler driver. All of the local ldflags can be passed through via -Wl, but we'd get no-pie via CFLAGS_NOPIE.

r~

#4 lore raw
Quoted 25 lines · Richard Henderson
Quoted 23 lines · Michael Roth

Quoting Jessica Clarke (2021-08-05 14:25:45)

Quoted 22 lines

This partially reverts commit bbd2d5a8120771ec59b86a80a1f51884e0a26e53.

This commit was misguided and broke using --disable-pie on any distro that enables PIE by default in their compiler driver, including Debian and its derivatives. Whilst -no-pie is not a linker flag, it is a compiler driver flag that ensures -pie is not automatically passed by it to the linker. Without it, all compile_prog checks will fail as any code built with the explicit -fno-pie will fail to link with the implicit default -pie due to trying to use position-dependent relocations. The only bug that needed fixing was LDFLAGS_NOPIE being used as a flag for the linker itself in pc-bios/optionrom/Makefile.

Note this does not reinstate exporting LDFLAGS_NOPIE, as it is unused, since the only previous use was the one that should not have existed. I have also updated the comment for the -fno-pie and -no-pie checks to reflect what they're actually needed for.

Fixes bbd2d5a8120771ec59b86a80a1f51884e0a26e53
Cc Christian Ehrhardt <[email protected]>
Cc Paolo Bonzini <[email protected]>
Quoted 6 lines
Quoted 2 lines

Ping. --disable-pie builds are broken on Ubuntu 20.04 without this regression fix. Looking to include it for v6.0.1/v6.1.1.

Sorry, missed this the first time around.

I think a better fix is to remove the direct invocation of ld in pc-bios/optionrom/Makefile, and instead rely on the compiler driver. All of the local ldflags can be passed through via -Wl, but we'd get no-pie via CFLAGS_NOPIE.

I am not changing anything about pc-bios/optionrom/Makefile. Whether you want to remove direct ld invocation or not, these changes are needed to reinstate --disable-pie support for everything else, which is currently broken. The only reason to mention pc-bios/optionrom/Makefile in the commit message is to explain why the original commit did what it did and what part of it is legitimate (even if there are better ways to have done it) and thus not reverted in this patch.

Jess

Reviewed-by
#5 lore raw
Quoted 33 lines · Jessica Clarke
Quoted 25 lines · Richard Henderson
Quoted 23 lines · Michael Roth

Quoting Jessica Clarke (2021-08-05 14:25:45)

Quoted 22 lines

This partially reverts commit bbd2d5a8120771ec59b86a80a1f51884e0a26e53.

This commit was misguided and broke using --disable-pie on any distro that enables PIE by default in their compiler driver, including Debian and its derivatives. Whilst -no-pie is not a linker flag, it is a compiler driver flag that ensures -pie is not automatically passed by it to the linker. Without it, all compile_prog checks will fail as any code built with the explicit -fno-pie will fail to link with the implicit default -pie due to trying to use position-dependent relocations. The only bug that needed fixing was LDFLAGS_NOPIE being used as a flag for the linker itself in pc-bios/optionrom/Makefile.

Note this does not reinstate exporting LDFLAGS_NOPIE, as it is unused, since the only previous use was the one that should not have existed. I have also updated the comment for the -fno-pie and -no-pie checks to reflect what they're actually needed for.

Fixes bbd2d5a8120771ec59b86a80a1f51884e0a26e53
Cc Christian Ehrhardt <[email protected]>
Cc Paolo Bonzini <[email protected]>
Quoted 6 lines
Quoted 2 lines

Ping. --disable-pie builds are broken on Ubuntu 20.04 without this regression fix. Looking to include it for v6.0.1/v6.1.1.

Sorry, missed this the first time around.

I think a better fix is to remove the direct invocation of ld in pc-bios/optionrom/Makefile, and instead rely on the compiler driver. All of the local ldflags can be passed through via -Wl, but we'd get no-pie via CFLAGS_NOPIE.

Quoted 7 lines

I am not changing anything about pc-bios/optionrom/Makefile. Whether you want to remove direct ld invocation or not, these changes are needed to reinstate --disable-pie support for everything else, which is currently broken. The only reason to mention pc-bios/optionrom/Makefile in the commit message is to explain why the original commit did what it did and what part of it is legitimate (even if there are better ways to have done it) and thus not reverted in this patch.

Ah, quite right -- currently configure fails.

r~

#6 lore raw
In reply to Jessica Clarke
Quoted 49 lines · Jessica Clarke

This partially reverts commit bbd2d5a8120771ec59b86a80a1f51884e0a26e53.

This commit was misguided and broke using --disable-pie on any distro that enables PIE by default in their compiler driver, including Debian and its derivatives. Whilst -no-pie is not a linker flag, it is a compiler driver flag that ensures -pie is not automatically passed by it to the linker. Without it, all compile_prog checks will fail as any code built with the explicit -fno-pie will fail to link with the implicit default -pie due to trying to use position-dependent relocations. The only bug that needed fixing was LDFLAGS_NOPIE being used as a flag for the linker itself in pc-bios/optionrom/Makefile.

Note this does not reinstate exporting LDFLAGS_NOPIE, as it is unused, since the only previous use was the one that should not have existed. I have also updated the comment for the -fno-pie and -no-pie checks to reflect what they're actually needed for.

Fixes bbd2d5a8120771ec59b86a80a1f51884e0a26e53
Cc Christian Ehrhardt <[email protected]>
Cc Paolo Bonzini <[email protected]>

---
Changes in v2:
* Actually include the comment change; didn't add the hunk when

     amending...
  configure | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
configure +3 -1
index 9a79a004d7..8aecd277ed 100755
@@ -2246,9 +2246,11 @@ static THREAD int tls_var;
  int main(void) { return tls_var; }
  EOF
 
-# Check we support --no-pie first; we will need this for building ROMs.
+# Check we support -fno-pie and -no-pie first; we will need the former for
+# building ROMs, and both for everything if --disable-pie is passed.
  if compile_prog "-Werror -fno-pie" "-no-pie"; then
    CFLAGS_NOPIE="-fno-pie"
+  LDFLAGS_NOPIE="-no-pie"
  fi
 
  if test "$static" = "yes"; then

configure if test "$static" = "yes"; then · line 2272

Quoted 7 lines
configure +1 -0
@@ -2264,6 +2266,7 @@ if test "$static" = "yes"; then
    fi
  elif test "$pie" = "no"; then
    CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS"
+  CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS"
  elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
    CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS"
    CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS"

Queued, thanks.

Paolo