diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2012-11-05 12:26:55 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2012-11-05 12:26:55 +0000 |
| commit | ad2be7e8b846f4cd67fa1e032f98d5dc1cdb6b8d (patch) | |
| tree | 3d4c2ce198bf1cd0d1787d818e30788625d0074b | |
| parent | 47dbf5b634b955c2db1221715d15751e1281546a (diff) | |
| download | binutils-ad2be7e8b846f4cd67fa1e032f98d5dc1cdb6b8d.tar.gz | |
* configure.ac: Apply 2012-09-10 change to config.in here.
* configure: Regenerate.
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rwxr-xr-x | gold/configure | 23 | ||||
| -rw-r--r-- | gold/configure.ac | 2 |
3 files changed, 20 insertions, 10 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 6c5a80e5a..5dfee3c28 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,10 @@ 2012-11-05 Alan Modra <amodra@gmail.com> + * configure.ac: Apply 2012-09-10 change to config.in here. + * configure: Regenerate. + +2012-11-05 Alan Modra <amodra@gmail.com> + * powerpc.cc (Powerpc_relobj): Delete "Offset" typedef. (struct Opd_ent): Use "Address" rather than "Offset". (Output_data_got_powerpc::got_base_offset): Return Valtype. diff --git a/gold/configure b/gold/configure index 6c28a5d63..4f74ae3eb 100755 --- a/gold/configure +++ b/gold/configure @@ -679,6 +679,8 @@ CFLAGS CC NM TARGETOBJS +DEFAULT_TARGET_TILEGX_FALSE +DEFAULT_TARGET_TILEGX_TRUE DEFAULT_TARGET_X86_64_FALSE DEFAULT_TARGET_X86_64_TRUE DEFAULT_TARGET_SPARC_FALSE @@ -3470,15 +3472,6 @@ else DEFAULT_TARGET_SPARC_FALSE= fi - if test "$targ_obj" = "tilegx"; then - DEFAULT_TARGET_TILEGX_TRUE= - DEFAULT_TARGET_TILEGX_FALSE='#' -else - DEFAULT_TARGET_TILEGX_TRUE='#' - DEFAULT_TARGET_TILEGX_FALSE= -fi - - if test "$targ_obj" = "x86_64"; then DEFAULT_TARGET_X86_64_TRUE= DEFAULT_TARGET_X86_64_FALSE='#' @@ -3487,6 +3480,14 @@ else DEFAULT_TARGET_X86_64_FALSE= fi + if test "$targ_obj" = "tilegx"; then + DEFAULT_TARGET_TILEGX_TRUE= + DEFAULT_TARGET_TILEGX_FALSE='#' +else + DEFAULT_TARGET_TILEGX_TRUE='#' + DEFAULT_TARGET_TILEGX_FALSE= +fi + fi fi fi @@ -7621,6 +7622,10 @@ if test -z "${DEFAULT_TARGET_X86_64_TRUE}" && test -z "${DEFAULT_TARGET_X86_64_F as_fn_error "conditional \"DEFAULT_TARGET_X86_64\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${DEFAULT_TARGET_TILEGX_TRUE}" && test -z "${DEFAULT_TARGET_TILEGX_FALSE}"; then + as_fn_error "conditional \"DEFAULT_TARGET_TILEGX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/gold/configure.ac b/gold/configure.ac index 27780c579..f8297f2fc 100644 --- a/gold/configure.ac +++ b/gold/configure.ac @@ -15,7 +15,7 @@ AM_CONFIG_HEADER(config.h:config.in) AH_VERBATIM([00_CONFIG_H_CHECK], [/* Check that config.h is #included before system headers (this works only for glibc, but that should be enough). */ -#if defined(__GLIBC__) && !defined(__CONFIG_H__) +#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__) # error config.h must be #included before system headers #endif #define __CONFIG_H__ 1]) |