fix merge conflicts

1 files changed, 6 insertions, 0 deletions

diff --git a/configure b/configure
index 379ecd16..3c78fe54 100755
--- a/configure
+++ b/configure
@@ -20,6 +20,7 @@ target=''
 has_runtime_lib=true
 has_standard_headers=true
 clightgen=false
+responsefile="gnu"
 
 usage='Usage: ./configure [options] target
 
@@ -218,6 +219,7 @@ if test "$arch" = "powerpc"; then
         libmath="-lm"
         struct_passing="ref-caller"
         system="diab"
+        responsefile="diab"
         ;;
     *)
         abi="eabi"
@@ -470,6 +472,7 @@ MODEL=$model
 STRUCT_PASSING=$struct_passing
 STRUCT_RETURN=$struct_return
 SYSTEM=$system
+RESPONSEFILE=$responsefile
 EOF
 else
 cat >> Makefile.config <<'EOF'
@@ -563,6 +566,9 @@ ASM_SUPPORTS_CFI=false
 # Turn on/off compilation of clightgen
 CLIGHTGEN=false
 
+# Whether the other tools support responsefiles in gnu syntax
+RESPONSEFILE="none"
+
 EOF
 fi