* pe-arm-wince.c (LOCAL_LABEL_PREFIX): Define as ".".

 * pei-arm-wince.c (LOCAL_LABEL_PREFIX): Likewise.
 * coff-arm.c (LOCAL_LABEL_PREFIX): Only define if not defined before.
 * gas/arm/undefined.d: Run test on Windows CE.
 * gas/arm/undefined_coff.d: Don't run test on Windows CE.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f3379fd5b7ca41dde75b106e242fd8fe37f1ffd8..478eb6df0a3630a05752a7713cfc6dd65d206483 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-10  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+       * pe-arm-wince.c (LOCAL_LABEL_PREFIX): Define as ".".
+       * pei-arm-wince.c (LOCAL_LABEL_PREFIX): Likewise.
+       * coff-arm.c (LOCAL_LABEL_PREFIX): Only define if not defined before.
+
 2006-11-07  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * elf32-arm.c (find_thumb_glue): Add ERROR_MESSAGE argument; set it

diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index 40420fa70a8eaa2eb7d8ca7a8d1fbe860d29a277..598489488c999869d49a7da583d883b48f105626 100644 (file)
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -2424,7 +2424,9 @@ Warning: Clearing the interworking flag of %B because non-interworking code in %
 
 /* Note:  the definitions here of LOCAL_LABEL_PREFIX and USER_LABEL_PREIFX
    *must* match the definitions in gcc/config/arm/{coff|semi|aout}.h.  */
+#ifndef LOCAL_LABEL_PREFIX
 #define LOCAL_LABEL_PREFIX ""
+#endif
 #ifndef USER_LABEL_PREFIX
 #define USER_LABEL_PREFIX "_"
 #endif

diff --git a/bfd/pe-arm-wince.c b/bfd/pe-arm-wince.c
index 57f8bcf3450a045178917b1bd1d6c2536ac62b7c..a13594fd89497a9234b80f4d8ee2bc3a90cfc18f 100644 (file)
--- a/bfd/pe-arm-wince.c
+++ b/bfd/pe-arm-wince.c
@@ -1,21 +1,21 @@
 /* BFD back-end for ARM WINCE PE files.
    Copyright 2006 Free Software Foundation, Inc.
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #define TARGET_UNDERSCORE    0
 #define USER_LABEL_PREFIX    ""
@@ -32,4 +32,6 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 #define bfd_arm_process_before_allocation \
   bfd_arm_wince_pe_process_before_allocation
 
+#define LOCAL_LABEL_PREFIX "."
+
 #include "pe-arm.c"

diff --git a/bfd/pei-arm-wince.c b/bfd/pei-arm-wince.c
index 48269c9994a588019bbe23ea15a4881af4dab5f7..7d5a3be3515b3a1af312f1959116f0677a1a2269 100644 (file)
--- a/bfd/pei-arm-wince.c
+++ b/bfd/pei-arm-wince.c
@@ -1,21 +1,21 @@
 /* BFD back-end for ARM WINCE PE IMAGE COFF files.
    Copyright 2006 Free Software Foundation, Inc.
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #define TARGET_UNDERSCORE    0
 #define USER_LABEL_PREFIX    ""
@@ -25,4 +25,6 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 #define TARGET_BIG_SYM       arm_wince_pei_big_vec
 #define TARGET_BIG_NAME      "pei-arm-wince-big"
 
+#define LOCAL_LABEL_PREFIX "."
+
 #include "pei-arm.c"

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index d81914c476781e3eecf11a027cf8bf0102009085..0a4b608c225d03867f71dbe72bf78090232f52b0 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-10  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+       * gas/arm/undefined.d: Run test on Windows CE.
+       * gas/arm/undefined_coff.d: Don't run test on Windows CE.
+
 2006-11-09  H.J. Lu  <hongjiu.lu@intel.com>
 
        * gas/i386/sse2.s: Test movdqa with memory destination.

diff --git a/gas/testsuite/gas/arm/undefined.d b/gas/testsuite/gas/arm/undefined.d
index 6a6149561cc38e9f924b017a3c3b66450461ca54..e3e9bb08929cd35ec42c65cd37194b5b97eea5cd 100644 (file)
--- a/gas/testsuite/gas/arm/undefined.d
+++ b/gas/testsuite/gas/arm/undefined.d
@@ -1,4 +1,5 @@
 #name: Undefined local label error
-# COFF and aout based ports use a different naming convention for local labels.
-#skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# COFF and aout based ports, except Windows CE, 
+# use a different naming convention for local labels.
+#skip: *-*-*coff *-unknown-pe *-epoc-pe *-*-*aout* *-*-netbsd *-*-riscix*
 #error-output: undefined.l

diff --git a/gas/testsuite/gas/arm/undefined_coff.d b/gas/testsuite/gas/arm/undefined_coff.d
index ab0bbcdc667202870f0f20618d35d185b7396d4e..d2800275b078c526d050bf5def891b6df96579b6 100644 (file)
--- a/gas/testsuite/gas/arm/undefined_coff.d
+++ b/gas/testsuite/gas/arm/undefined_coff.d
@@ -1,4 +1,5 @@
 #name: Undefined local label error
-# COFF and aout based ports use a different naming convention for local labels.
-#not-skip: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+# COFF and aout based ports, except Windows CE, 
+# use a different naming convention for local labels.
+#not-skip: *-*-*coff *-unknown-pe *-epoc-pe *-*-*aout* *-*-netbsd *-*-riscix*
 #error-output: undefined_coff.l