[users/roland/gold-charnn] gold: Use char16_t, char32_t instead of uint16_t, uint32_t as character types
Checks
Commit Message
The std::basic_string template type is only specified for
instantiations using character types. Newer (LLVM) libc++
implementations no longer allow non-character integer types
to be used.
Ok for trunk?
Thanks,
Roland
Comments
> The std::basic_string template type is only specified for
> instantiations using character types. Newer (LLVM) libc++
> implementations no longer allow non-character integer types
> to be used.
>
> Ok for trunk?
LGTM. Thanks!
-cary
Committed.
Thanks,
Roland
Hello,
This patch has started causing errors in our builds, using GCC 4.8.5.
This is affecting our cross builds of these targets:
aarch64_be_none_linux_gnu
aarch64_none_linux_gnu
arm_none_linux_gnueabi
arm_none_linux_gnueabihf
The errors are:
/…/src/binutils-gdb/gold/merge.cc:668:27: error: ‘char16_t’ was not declared in this scope
class Output_merge_string<char16_t>;
^
/…/src/binutils-gdb/gold/merge.cc:668:35: error: template argument 1 is invalid
class Output_merge_string<char16_t>;
^
/…/src/binutils-gdb/gold/merge.cc:671:27: error: ‘char32_t’ was not declared in this scope
class Output_merge_string<char32_t>;
^
/…/src/binutils-gdb/gold/merge.cc:671:35: error: template argument 1 is invalid
class Output_merge_string<char32_t>;
^
Kind regards,
Vasee
I didn't realize that building gold with compilers so old they don't
support C++11 was supported. The GCC source history suggests that
char16_t and char32_t support were introduced in GCC 4.4. I'm not
sure when the default C++ mode was changed to be >= -std=c++11. It
looks to me that the configure stuff should be making it pass
`-std=c++11` if that's required, but I don't know how that test is
coming out in your build. I wonder if using `CXX=g++ -std=c++11`
makes a difference with your version.
@@ -665,10 +665,10 @@ template
class Output_merge_string<char>;
template
-class Output_merge_string<uint16_t>;
+class Output_merge_string<char16_t>;
template
-class Output_merge_string<uint32_t>;
+class Output_merge_string<char32_t>;
#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG)
template
@@ -29,6 +29,7 @@
#include <unistd.h>
#include <sys/stat.h>
#include <algorithm>
+#include <uchar.h>
#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
@@ -2706,10 +2707,10 @@
Output_section::add_merge_input_section(Relobj* object, unsigned int
shndx,
pomb = new Output_merge_string<char>(addralign);
break;
case 2:
- pomb = new Output_merge_string<uint16_t>(addralign);
+ pomb = new Output_merge_string<char16_t>(addralign);
break;
case 4:
- pomb = new Output_merge_string<uint32_t>(addralign);
+ pomb = new Output_merge_string<char32_t>(addralign);
break;
default:
return false;
@@ -25,6 +25,7 @@
#include <cstring>
#include <algorithm>
#include <vector>
+#include <uchar.h>
#include "output.h"
#include "parameters.h"
@@ -527,9 +528,9 @@ template
class Stringpool_template<char>;
template
-class Stringpool_template<uint16_t>;
+class Stringpool_template<char16_t>;
template
-class Stringpool_template<uint32_t>;
+class Stringpool_template<char32_t>;
} // End namespace gold.