From 6502ec2e054abafe075dc317c5fe53a681355a7a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 10 Jun 2024 16:41:43 +0200 Subject: [PATCH] gcc/config/i386: apply change from 13.x to haiku Change-Id: Ic4bc039f68d2d558f0fe5a93101c53e70976d4c6 Reviewed-on: https://review.haiku-os.org/c/buildtools/+/7725 Reviewed-by: waddlesplash --- gcc/gcc/config/i386/haiku.h | 6 +++--- gcc/gcc/config/i386/haiku64.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/gcc/config/i386/haiku.h b/gcc/gcc/config/i386/haiku.h index 4db6266e1c..d8c208d588 100644 --- a/gcc/gcc/config/i386/haiku.h +++ b/gcc/gcc/config/i386/haiku.h @@ -28,9 +28,9 @@ Boston, MA 02111-1307, USA. */ #undef DEFAULT_PCC_STRUCT_RETURN #define DEFAULT_PCC_STRUCT_RETURN 1 -#undef DBX_REGISTER_NUMBER -#define DBX_REGISTER_NUMBER(n) \ - (TARGET_64BIT ? dbx64_register_map[n] : svr4_dbx_register_map[n]) +#undef DEBUGGER_REGNO +#define DEBUGGER_REGNO(n) \ + (TARGET_64BIT ? debugger64_register_map[n] : svr4_debugger_register_map[n]) #define TARGET_OS_CPP_BUILTINS() \ do \ diff --git a/gcc/gcc/config/i386/haiku64.h b/gcc/gcc/config/i386/haiku64.h index 37810453a5..d9d99c3b1a 100644 --- a/gcc/gcc/config/i386/haiku64.h +++ b/gcc/gcc/config/i386/haiku64.h @@ -30,9 +30,9 @@ Boston, MA 02111-1307, USA. */ #undef DEFAULT_PCC_STRUCT_RETURN #define DEFAULT_PCC_STRUCT_RETURN 1 -#undef DBX_REGISTER_NUMBER -#define DBX_REGISTER_NUMBER(n) \ - (TARGET_64BIT ? dbx64_register_map[n] : svr4_dbx_register_map[n]) +#undef DEBUGGER_REGNO +#define DEBUGGER_REGNO(n) \ + (TARGET_64BIT ? debugger64_register_map[n] : svr4_debugger_register_map[n]) #define TARGET_OS_CPP_BUILTINS() \ do \