From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-66524-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 24830 invoked by alias); 5 Sep 2009 15:45:56 -0000
Received: (qmail 24810 invoked by uid 22791); 5 Sep 2009 15:45:53 -0000
X-SWARE-Spam-Status: No, hits=0.1 required=5.0 	tests=AWL,BAYES_00,HK_OBFDOM,J_CHICKENPOX_22,J_CHICKENPOX_31,J_CHICKENPOX_33,J_CHICKENPOX_63,J_CHICKENPOX_66,SPF_SOFTFAIL
X-Spam-Check-By: sourceware.org
Received: from mtaout4.012.net.il (HELO mtaout3.012.net.il) (84.95.2.10)     by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 05 Sep 2009 15:45:47 +0000
Received: from conversion-daemon.i_mtaout3.012.net.il by i_mtaout3.012.net.il (HyperSendmail v2004.12) id <0KPI00A008VUS500@i_mtaout3.012.net.il> for gdb-patches@sourceware.org; Sat, 05 Sep 2009 18:45:44 +0300 (IDT)
Received: from HOME-C4E4A596F7 ([84.228.50.163]) by i_mtaout3.012.net.il (HyperSendmail v2004.12) with ESMTPA id <0KPI008Y79470Y00@i_mtaout3.012.net.il> for gdb-patches@sourceware.org; Sat, 05 Sep 2009 18:45:44 +0300 (IDT)
Date: Sat, 05 Sep 2009 15:45:00 -0000
From: Eli Zaretskii <eliz@gnu.org>
Subject: [djgpp/commit] Fix the DJGPP build of GDB
To: gdb-patches@sourceware.org
Reply-to: Eli Zaretskii <eliz@gnu.org>
Message-id: <83k50d4cst.fsf@gnu.org>
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2009-09/txt/msg00119.txt.bz2

The recent switch to Autoconf 2.64 shattered the DJGPP configury stuff
to pieces.  The tweaks below make it work again.  Committed.

2009-09-05  Eli Zaretskii  <eliz@gnu.org>

	* config/djgpp/djconfig.sh: Fix for Autoconf 2.64.
	* config/djgpp/config.sed: Fix for Autoconf 2.64.


Index: gdb/config/djgpp/config.sed
===================================================================
RCS file: /cvs/src/src/gdb/config/djgpp/config.sed,v
retrieving revision 1.9
diff -u -r1.9 config.sed
--- gdb/config/djgpp/config.sed	19 Apr 2009 18:29:34 -0000	1.9
+++ gdb/config/djgpp/config.sed	5 Sep 2009 15:39:44 -0000
@@ -2,31 +2,37 @@
 s|gdb\.c++|gdb.cxx|g
 /ac_rel_source/s|ln -s|cp -p|
 s|\.gdbinit|gdb.ini|g
+# This works around a bug in DJGPP port of Bash 2.0x
+s|return $ac_retval|(&)|g
+# DJGPP port of Bash 2.04 doesn't like this redirection of stdin
+/exec 7</s|7<&0 </dev/null||
+# Make sure $PATH_SEPARATOR is set correctly
+/if test "${PATH_SEPARATOR+set}"/i\
+export PATH_SEPARATOR=';'
 
-# Edit Makefiles.  This should go near the beginning of
+# Edit Makefiles for 8+3 DOS file-name compliance and path separator.
+# This should go near the beginning of
 # the substitutions script, before the branch command that
 # skips any lines without @...@ in them.
 # Any commands that can match again after substitution must
 # do a conditional branch to next cycle (;t), or else Sed might hang.
-/(echo[ 	]*':t/a\
+/\/@\[a-zA-Z_\]\[a-zA-Z_0-9\]\*@\/!b/i\
+  /VPATH *=/s,\\([^A-z]\\):,\\1;,g\
   s,\\([yp*]\\)\\.tab,\\1_tab,g\
   s,\\$@\\.tmp,\\$@_tmp,g\
   s,\\$@\\.new,\\$@_new,g\
-  /^	@rm -f/s,\\$@-\\[0-9\\]\\[0-9\\],& *.i[1-9] *.i[1-9][0-9],;t\
   s,standards\\.info\\*,standard*.inf*,\
   s,configure\\.info\\*,configur*.inf*,\
   s,\\.info\\*,.inf* *.i[1-9] *.i[1-9][0-9],\
   s,\\.gdbinit,gdb.ini,g\
-  s,@PATH_SEPARATOR@,";",\
-  /TEXINPUTS=/s,:,";",g\
-  /VPATH *=/s,\\([^A-z]\\):,\\1;,g\
-  /\\$\\$file-\\[0-9\\]/s,echo,& *.i[1-9] *.i[1-9][0-9],;t\
-  /\\$\\$file-\\[0-9\\]/s,rm -f \\$\\$file,& \\${PACKAGE}.i[1-9] \\${PACKAGE}.i[1-9][0-9],;t\
+  /TEXINPUTS=/s,:,\\";\\",g\
   s,config\\.h\\.in,config.h-in,g;t t\
-  s,po2tbl\\.sed\\.in,po2tblsed.in,g;t t
+  /^	@rm -f/s,\\$@-\\[0-9\\]\\[0-9\\],& *.i[1-9] *.i[1-9][0-9],;t\
+  /\\$\\$file-\\[0-9\\]/s,echo,& *.i[1-9] *.i[1-9][0-9],;t\
+  /\\$\\$file-\\[0-9\\]/s,rm -f \\$\\$file,& \\${PACKAGE}.i[1-9] \\${PACKAGE}.i[1-9][0-9],;t
 
 # We have an emulation of nl_langinfo in go32-nat.c that supports CODESET.
-/^ac_cv_env_CPP_value=/a\
+/^for ac_var in $ac_precious_vars; do/i\
 am_cv_langinfo_codeset=yes\
 bash_cv_langinfo_codeset=yes\
 ac_cv_header_nl_types_h=yes
@@ -42,19 +48,12 @@
 
 }
 
-/^CONFIG_FILES=/,/^EOF/ {
-  s|po/Makefile.in\([^-:a-z]\)|po/Makefile.in:po/Makefile.in-in\1|
-}
-
 /^ *# *Handling of arguments/,/^done/ {
   s| config.h"| config.h:config.h-in"|
+  s| config.intl"| config.intl:config_intl.in"|
   s|config.h\([^-:"a-z]\)|config.h:config.h-in\1|
 }
 
 /^[ 	]*\/\*)/s,/\*,/*|[A-z]:/*,
-/\$]\*) INSTALL=/s,\[/\$\]\*,&|[A-z]:/*,
-/\$]\*) ac_rel_source=/s,\[/\$\]\*,&|[A-z]:/*,
-/ac_file_inputs=/s,\( -e "s%\^%\$ac_given_srcdir/%"\)\( -e "s%:% $ac_given_srcdir/%g"\),\2\1,
-/^[ 	]*if test "x`echo /s,sed 's@/,sed -e 's@^[A-z]:@@' -e 's@/,
 /^ *ac_config_headers=/s, config.h", config.h:config.h-in",
 /^ *ac_config_files=/s, config.intl", config.intl:config_intl.in",


Index: gdb/config/djgpp/djconfig.sh
===================================================================
RCS file: /cvs/src/src/gdb/config/djgpp/djconfig.sh,v
retrieving revision 1.15
diff -u -r1.15 djconfig.sh
--- gdb/config/djgpp/djconfig.sh	14 Apr 2009 14:25:12 -0000	1.15
+++ gdb/config/djgpp/djconfig.sh	5 Sep 2009 15:39:44 -0000
@@ -141,11 +141,13 @@
 export LD=ld
 export NM=nm
 export CC=gcc
-export CFLAGS="-O2 -g"
+export CXX=gpp
+export CFLAGS="-O2 -ggdb -g3"
 export RANLIB=ranlib
 export DEFAULT_YACC="bison -y"
 export YACC="bison -y"
 export DEFAULT_LEX=flex
+export PATH_SEPARATOR=';'
 # Define explicitly the .exe extension because on W95 with LFN=y
 # the check might fail
 export am_cv_exeext=.exe